From 375b617d831ca929b1eab7d499cf5b0e2797e21b Mon Sep 17 00:00:00 2001 From: renzexin Date: Thu, 15 Aug 2024 11:31:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chushang/inspection/project/dto/ContractDTO.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java index 5ad1778..5df66aa 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java @@ -9,6 +9,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.time.LocalDate; import java.time.LocalDateTime; /** @@ -37,7 +38,7 @@ public class ContractDTO { */ @NotNull(message = "项目合同开始时间不能为空", groups = Create.class) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime contractStartTime; + private LocalDate contractStartTime; /** * 合同有效期结束日期 @@ -45,7 +46,7 @@ public class ContractDTO { @TableField(value = "contract_end_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull(message = "项目合同结束时间不能为空", groups = Create.class) - private LocalDateTime contractEndTime; + private LocalDate contractEndTime; /** * 合同金额 */ From 2a33f118fcbdb1a2f7b7e7a2ef6ae96802296e28 Mon Sep 17 00:00:00 2001 From: renzexin Date: Thu, 15 Aug 2024 11:33:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chushang/inspection/project/dto/ContractDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java index 5df66aa..5e67111 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ContractDTO.java @@ -38,7 +38,7 @@ public class ContractDTO { */ @NotNull(message = "项目合同开始时间不能为空", groups = Create.class) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDate contractStartTime; + private LocalDateTime contractStartTime; /** * 合同有效期结束日期 @@ -46,7 +46,7 @@ public class ContractDTO { @TableField(value = "contract_end_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull(message = "项目合同结束时间不能为空", groups = Create.class) - private LocalDate contractEndTime; + private LocalDateTime contractEndTime; /** * 合同金额 */ From 96b989d7b3d0d0daf873f9cb398fe901a8c58db3 Mon Sep 17 00:00:00 2001 From: renzexin Date: Thu, 15 Aug 2024 12:08:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/WrkProjectService.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java index e5c401f..218e028 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java @@ -142,19 +142,19 @@ public class WrkProjectService extends ServiceImpl BeanUtil.copyProperties(project, wrkProject); this.updateById(wrkProject); // 项目合同 -// WrkProjectContract contract = WrkProjectContract.builder().build(); -// BeanUtil.copyProperties(project.getContract(), contract); -// LocalDateTime now = LocalDateTime.now(); -// // 在 之前 && 在 之后 无效 -// if (now.isBefore(contract.getContractStartTime()) && now.isAfter(contract.getContractEndTime())) { -// contract.setProjectEffect(0); -// }else { -// contract.setProjectEffect(1); -// } -// // 未回款完成 -// contract.setPaymentState(0); - // 项目合同 修改时不需要 项目id -// contractService.updateById(contract); + WrkProjectContract contract = WrkProjectContract.builder().build(); + BeanUtil.copyProperties(project.getContract(), contract); + LocalDateTime now = LocalDateTime.now(); + // 在 之前 && 在 之后 无效 + if (now.isBefore(contract.getContractStartTime()) && now.isAfter(contract.getContractEndTime())) { + contract.setProjectEffect(0); + }else { + contract.setProjectEffect(1); + } + // 未回款完成 + contract.setPaymentState(0); + //项目合同 修改时不需要 项目id + contractService.updateById(contract); return wrkProject.getProjectId(); } From e77cd63ae07132fc94d12dd9ec73603d462d9b52 Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Thu, 15 Aug 2024 16:18:29 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chushang/inspection/project/po/Template.java | 6 ++++++ .../java/com/chushang/inspection/project/po/WrkProject.java | 3 ++- .../chushang/inspection/work/query/WrkAuditRuleQuery.java | 5 +++++ .../java/com/chushang/system/entity/dto/ListDeptDTO.java | 2 +- .../java/com/chushang/system/entity/dto/ListMenuDTO.java | 2 +- .../java/com/chushang/system/entity/dto/ListRoleDTO.java | 2 +- .../java/com/chushang/system/controller/RoleController.java | 2 +- .../src/main/resources/mapper/SysDeptMapper.xml | 2 +- .../src/main/resources/mapper/SysMenuMapper.xml | 4 ++-- .../src/main/resources/mapper/SysRoleMapper.xml | 2 +- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/Template.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/Template.java index 894081f..fbb7df6 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/Template.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/Template.java @@ -15,6 +15,8 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import javax.validation.constraints.NotNull; +import java.time.LocalDateTime; +import java.util.List; /** * @auther: zhao @@ -59,4 +61,8 @@ public class Template extends BaseEntity { @Condition(name = "template_type") @DictFormat(dictType = "template_type") private String templateType; + + @TableField(exist = false) + @Condition(name = "create_time", type = Condition.ConditionType.between) + private List disposeTime; } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java index 484e57b..4b0b476 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java @@ -108,7 +108,7 @@ public class WrkProject extends BaseEntity { @TableField(exist = false) @Condition(name = "create_time", type = Condition.ConditionType.between) @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - private List createTimes; + private List createTimes; /** * 项目对应的 合同集合 */ @@ -141,4 +141,5 @@ public class WrkProject extends BaseEntity { private String contractUrl; + } diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAuditRuleQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAuditRuleQuery.java index 85770ec..f1da731 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAuditRuleQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/WrkAuditRuleQuery.java @@ -39,4 +39,9 @@ public class WrkAuditRuleQuery extends CommonParam { private String name; + + @Condition(name = "create_time", type = Condition.ConditionType.between) + private List createTime; + + } diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDeptDTO.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDeptDTO.java index 6e17266..cbb029a 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDeptDTO.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListDeptDTO.java @@ -17,6 +17,6 @@ public class ListDeptDTO extends CommonParam { private String deptName; - private Boolean status; + private Integer status; } diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListMenuDTO.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListMenuDTO.java index 5c88135..48cbc07 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListMenuDTO.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListMenuDTO.java @@ -17,7 +17,7 @@ public class ListMenuDTO extends CommonParam { /** * 状态 */ - private boolean status; + private Integer status; /** * 是否隐藏 */ diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java index 547e6ce..fd980e3 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/dto/ListRoleDTO.java @@ -15,7 +15,7 @@ import java.util.Objects; public class ListRoleDTO extends CommonParam { private String roleName; private String roleKey; - private Boolean status; + private Integer status; private Params params; @Data diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java index 9314451..c7c02c7 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java @@ -43,7 +43,7 @@ public class RoleController { public AjaxResult list( @RequestParam(required = false) String roleName, @RequestParam(required = false) String roleKey, - @RequestParam(required = false) Boolean status, + @RequestParam(required = false) Integer status, @RequestParam(required = false) String beginTime, @RequestParam(required = false) String endTime ) { diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml index 29be0cd..3e33066 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml +++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml @@ -31,7 +31,7 @@ AND d.dept_name like concat('%', #{deptName}, '%') - + AND d.status = #{status} diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml index fa71806..44f3d33 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml +++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml @@ -65,7 +65,7 @@ AND visible = #{visible} - + AND status = #{status} order by parent_id, order_num @@ -100,7 +100,7 @@ AND m.visible = #{visible} - + AND m.status = #{status} order by m.parent_id, m.order_num diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml index d8012d4..1898a30 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml +++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml @@ -63,7 +63,7 @@ AND r.role_name like concat('%', #{listRole.roleName}, '%') - + AND r.status = #{listRole.status} From e6e997b1792e027115b384bb55e9bc4cddfe5960 Mon Sep 17 00:00:00 2001 From: renzexin Date: Thu, 15 Aug 2024 16:52:11 +0800 Subject: [PATCH 5/6] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?shangchuan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/chushang/oss/entity/vo/FileVo.java | 11 +++++++++++ .../com/chushang/oss/service/FileSourceService.java | 10 ++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/vo/FileVo.java diff --git a/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/vo/FileVo.java b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/vo/FileVo.java new file mode 100644 index 0000000..89169c9 --- /dev/null +++ b/chushang-modules/chushang-module-oss/oss-feign/src/main/java/com/chushang/oss/entity/vo/FileVo.java @@ -0,0 +1,11 @@ +package com.chushang.oss.entity.vo; + +import lombok.Data; + +@Data +public class FileVo { + private String fid; + private String mimeType; + private String realPath; + private String fileName; +} diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java index 753a3b7..a73b54f 100644 --- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java +++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java @@ -23,6 +23,7 @@ import com.chushang.oss.config.UploadConfig; import com.chushang.oss.entity.FileSourceInfo; import com.chushang.oss.entity.dto.OcrDTO; import com.chushang.oss.entity.vo.FileSourceVo; +import com.chushang.oss.entity.vo.FileVo; import com.chushang.oss.enums.OcrTypeEnum; import com.chushang.oss.mapper.FileSourceMapper; import com.chushang.security.utils.SecurityUtils; @@ -253,7 +254,7 @@ public class FileSourceService return upload; } - public String uploadContract(MultipartFile file) throws Exception + public FileVo uploadContract(MultipartFile file) throws Exception { String ip = IPUtils.clientIp(ServletUtils.getRequest()); String fid = generateFid(); @@ -284,7 +285,12 @@ public class FileSourceService String upload = ossService.upload(file.getInputStream(), fileSourceInfo); fileSourceInfo.setRealPath(upload); save(fileSourceInfo); - return upload; + FileVo fileVo = new FileVo(); + fileVo.setRealPath(upload); + fileVo.setFid(fid); + fileVo.setMimeType(mimetype); + fileVo.setFileName(fName); + return fileVo; } public FileSourceVo addFile(byte[] bytes, String fileName, Boolean sealFlag, String formats, String fileType) From 5321434d86e07cc45e4fed0e6bc853b3ec8bf7f2 Mon Sep 17 00:00:00 2001 From: renzexin Date: Thu, 15 Aug 2024 17:05:37 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?shangchuan?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/po/WrkProjectContract.java | 2 ++ .../project/mapper/WrkProjectMapper.java | 9 +++++++++ .../service/WrkProjectContractService.java | 19 +++++++++++++------ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java index f25d15d..d831e44 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java @@ -107,4 +107,6 @@ public class WrkProjectContract extends BaseEntity { */ @TableField(exist = false) private List audits; + + private String mimeType; } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java index 10e3538..001a53a 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/mapper/WrkProjectMapper.java @@ -1,11 +1,20 @@ package com.chushang.inspection.project.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.chushang.inspection.project.po.WrkProject; +import com.chushang.inspection.project.po.WrkProjectContract; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @auther: zhao * @date: 2024/6/15 10:51 */ public interface WrkProjectMapper extends BaseMapper { + @Select("select wrk.*,file.mime_type as mimeType from \n" + + "tb_inspection.wrk_project_contract wrk \n" + + "left join tb_file.tb_file_source_info file on wrk.remark = file.fid \n" + + " where wrk.project_id = #{projectId}") + IPage selectContractsWithAdditionalData(IPage page, @Param("projectId") Long projectId); } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java index ef7e3e1..8df98a4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectContractService.java @@ -8,7 +8,9 @@ import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; import com.chushang.inspection.project.dto.PageAuditDTO; +import com.chushang.inspection.project.mapper.WrkProjectMapper; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.inspection.project.mapper.WrkProjectContractMapper; @@ -42,13 +44,18 @@ public class WrkProjectContractService extends ServiceImpl queryWrapper = WrapperUtils.builder(contract, commonParam); - IPage page = this.page( - new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), - queryWrapper - ); - return new PageResult(page); +// LambdaQueryWrapper queryWrapper = WrapperUtils.builder(contract, commonParam); +// IPage page = this.page( +// new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), +// queryWrapper +// ); + IPage page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()); + IPage resultPage = wrkProjectMapper.selectContractsWithAdditionalData(page, contract.getProjectId()); + return new PageResult(resultPage); +// return new PageResult(page); }