chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.chually.cn/chujinwang/chushangcloud

This commit is contained in:
mashuanghui 2024-08-14 10:23:08 +08:00
parent 3133b7298b a5931aa966
commit 52cebb0327
6 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chushang-common/chushang-common-mybatis/src/main/java/com/chushang/common/mybatis/utils/WrapperUtils.java
View File

@ -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

3
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/TaskQuery.java
View File

@ -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;
}

8
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/terminal/query/TerminalQuery.java
View File

@ -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<LocalDateTime> inspectionTime;
@Condition(name = "`inspection_time`", type = Condition.ConditionType.between, tableName = "ti")
private List<String> inspectionTime;
/**
* 创建时间
*/
@JsonFormat(pattern = DatePattern.NORM_DATETIME_PATTERN)
@Condition(name = "`create_time`", type = Condition.ConditionType.in, tableName = "s")
private List<LocalDateTime> createTimes;
@Condition(name = "`create_time`", type = Condition.ConditionType.between, tableName = "s")
private List<String> createTimes;
/**
* 终端型号
*/

17
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
View File

@ -119,11 +119,12 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
ContractDTO contract = project.getContract();
LocalDateTime now = LocalDateTime.now();
// 项目合同
if (now.isBefore(contract.getContractStartTime()) && now.isAfter(contract.getContractEndTime())) {
wrkProject.setProjectEffect(0);
}else {
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<WrkProjectMapper, WrkProject>
// 未回款完成
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);

2
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/impl/PollingTaskServiceImpl.java
View File

@ -346,7 +346,7 @@ public class PollingTaskServiceImpl extends ServiceImpl<PollingTaskMapper, Polli
max = max == null ? 1 : max + 1;
task.setSearchNum(max + "-");
task.setSearchIndex(max);
task.setLevel(max);
task.setLevel(1);
}
}

17
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/TerminalServiceImpl.java
View File

@ -194,15 +194,20 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, Terminal> 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();
}