From 44abed99270e780bea37c5c781be43b827563f7a Mon Sep 17 00:00:00 2001 From: Chujinwang <17638147107@163.com> Date: Fri, 9 Aug 2024 09:53:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PollingTaskServiceImpl.java | 2 +- .../service/impl/TerminalServiceImpl.java | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java index 5e189fd..0e360fb 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java @@ -346,7 +346,7 @@ public class PollingTaskServiceImpl extends ServiceImpl i @Override @Transactional(rollbackFor = Exception.class) public long updateTerminalAndStore(TerminalQuery query) { - /** - * 当前终端 - */ Terminal curTerminal = getById(query.getTerminalId()); AssertUtil.invalidate(ObjectUtil.isEmpty(curTerminal), "未找寻到对应的终端信息"); - Terminal terminal = BeanCopyUtils.copy(query, Terminal.class); - updateById(terminal); - Store store = BeanCopyUtils.copy(query, Store.class); + curTerminal.setTerminalNo(query.getTerminalNo()); + curTerminal.setTerminalSn(query.getTerminalSn()); + curTerminal.setTerminalAddress(query.getTerminalAddress()); + curTerminal.setTerminalModel(query.getTerminalModel()); + curTerminal.setTerminalType(query.getTerminalType()); + curTerminal.setTerminalSource(query.getTerminalSource()); + updateById(curTerminal); + Store store = new Store(); store.setStoreId(curTerminal.getStoreId()); + store.setStoreNo(query.getStoreNo()); + store.setStoreName(query.getStoreName()); + store.setState(query.getStoreState()); storeService.updateById(store); return query.getTerminalId(); } From 94fcdc08309d3b5c0621c06d0b9d9caa17091384 Mon Sep 17 00:00:00 2001 From: renzexin Date: Wed, 14 Aug 2024 09:09:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chushang/inspection/project/dto/TaskQuery.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskQuery.java index 8008a8f..b416130 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskQuery.java @@ -43,4 +43,7 @@ public class TaskQuery extends CommonParam { */ @TableField(value = "end_time") private LocalDateTime endTime; + + @Condition(name = "name", type = Condition.ConditionType.eq) + private String deptName; } From 42c12bf2ac4407ad6317384bbfe35d38a168f173 Mon Sep 17 00:00:00 2001 From: likewei <2211508111@qq.com> Date: Wed, 14 Aug 2024 10:22:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/mybatis/utils/WrapperUtils.java | 14 ++++++------- .../terminal/query/TerminalQuery.java | 8 +++---- .../project/service/WrkProjectService.java | 21 ++++++++++++------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java index 0840134..52f8e1a 100644 --- a/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java +++ b/chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java @@ -53,21 +53,21 @@ public class WrapperUtils { case ge -> { if (StringUtils.isNotEmpty(tableName)) { allSql.append(" AND ").append(tableName).append(".") - .append(name).append(" $ge; ").append(value).append(" "); + .append(name).append(" $ge; ").append("'").append(value).append("'").append(" "); } } case le -> { if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") - .append(name).append(" $le; ").append(value).append(" "); + .append(name).append(" $le; ").append("'").append(value).append("'").append(" "); } case gt -> { if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") - .append(name).append(" $gt; ").append(value).append(" "); + .append(name).append(" $gt; ").append("'").append(value).append("'").append(" "); } case lt -> { if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") - .append(name).append(" $lt; ").append(value).append(" "); + .append(name).append(" $lt; ").append("'").append(value).append("'").append(" "); } case isNull -> { if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") @@ -75,11 +75,11 @@ public class WrapperUtils { } case eq -> { if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") - .append(name).append(" = ").append(value).append(" "); + .append(name).append(" = ").append("'").append(value).append("'").append(" "); } case like -> { if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") - .append(name).append(" like concat('%', ").append(value).append(", '%'").append(" "); + .append(name).append(" like concat('%', ").append("'").append(value).append("'").append(", '%'").append(") "); } case in -> { if (value instanceof Collection values) { @@ -113,7 +113,7 @@ public class WrapperUtils { } case likeLeft -> { if (StringUtils.isNotEmpty(tableName)) allSql.append(" AND ").append(tableName).append(".") - .append(name).append(" like concat('%', ").append(value).append(", '')").append(" "); + .append(name).append(" like concat('%', ").append("'").append(value).append("'").append(", '')").append(" "); } case dataScope -> { // TODO 因为 dataScope 是在父类, 所以没有指定tableName, 此处无法获取对应的dataScopeIds diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java index 86ca80e..5b0f86b 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java @@ -91,14 +91,14 @@ public class TerminalQuery extends CommonParam { * 巡检时间 */ @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - @Condition(name = "`inspection_time`", type = Condition.ConditionType.in, tableName = "ti") - private List inspectionTime; + @Condition(name = "`inspection_time`", type = Condition.ConditionType.between, tableName = "ti") + private List inspectionTime; /** * 创建时间 */ @JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN) - @Condition(name = "`create_time`", type = Condition.ConditionType.in, tableName = "s") - private List createTimes; + @Condition(name = "`create_time`", type = Condition.ConditionType.between, tableName = "s") + private List createTimes; /** * 终端型号 */ 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 4204213..e5c401f 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 @@ -119,10 +119,11 @@ public class WrkProjectService extends ServiceImpl ContractDTO contract = project.getContract(); LocalDateTime now = LocalDateTime.now(); // 项目合同 - if (now.isBefore(contract.getContractStartTime()) && now.isAfter(contract.getContractEndTime())) { - wrkProject.setProjectEffect(0); - }else { - wrkProject.setProjectEffect(1); + wrkProject.setProjectEffect(0); + if(contract.getContractStartTime() != null && contract.getContractEndTime() != null) { + if (now.isAfter(contract.getContractStartTime()) && now.isBefore(contract.getContractEndTime())) { + wrkProject.setProjectEffect(1); + } } this.save(wrkProject); contract.setProjectId(wrkProject.getProjectId()); @@ -189,16 +190,22 @@ public class WrkProjectService extends ServiceImpl // 未回款完成 projectContract.setPaymentState(0); LocalDateTime now = LocalDateTime.now(); - boolean projectEffect = !now.isBefore(contract.getContractStartTime()) || !now.isAfter(contract.getContractEndTime()); + + int projectEffect = 0; + if(contract.getContractStartTime() != null && contract.getContractEndTime() != null) { + if (now.isAfter(contract.getContractStartTime()) && now.isBefore(contract.getContractEndTime())) { + projectEffect = 1; + } + } // 在 之前 && 在 之后 无效 - projectContract.setProjectEffect(projectEffect ? 1 : 0); + projectContract.setProjectEffect(projectEffect); Long deptId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); projectContract.setDeptId(deptId); // 新增合同的时候, 为待初审状态 projectContract.setAuditStatus(1); contractService.save(projectContract); - updateState(contract.getProjectId(), projectEffect ? 1 : 0 ); + updateState(contract.getProjectId(), projectEffect); // 新增合同的时候, 项目状态为待初审状态 // updateAuditStatus(contract.getProjectId(), 1);