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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
ant 2024-08-01 10:34:39 +08:00
parent 4901af59a8 1c7e3d2fc6
commit d1d6874178
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkAuditRuleServiceImpl.java
View File

@ -65,6 +65,7 @@ import com.chushang.task.enums.ServiceEnum;
import com.chushang.task.enums.TaskTypeEnum; import com.chushang.task.enums.TaskTypeEnum;
import com.chushang.task.feign.RemoteTaskService; import com.chushang.task.feign.RemoteTaskService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.bouncycastle.util.Strings;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -105,7 +106,9 @@ public class WrkAuditRuleServiceImpl extends ServiceImpl<WrkAuditRuleMapper, Wrk
for (String s : record.getRuleTime().split(",")) { for (String s : record.getRuleTime().split(",")) {
list.add(date.get(s)); list.add(date.get(s));
} }
record.setRuleTimeList(Arrays.asList(String.join(",", list))); record.setRuleTimeList(Arrays.asList(record.getRuleTime().split(",")));
record.setRuleTime(String.join(",", list));
} }
return new PageResult(page); return new PageResult(page);
@ -118,7 +121,7 @@ public class WrkAuditRuleServiceImpl extends ServiceImpl<WrkAuditRuleMapper, Wrk
Assert.notNull(wrkAuditRule, "修改失败，数据不存在"); Assert.notNull(wrkAuditRule, "修改失败，数据不存在");
BeanUtil.copyProperties(dto, wrkAuditRule); BeanUtil.copyProperties(dto, wrkAuditRule);
if(!dto.getRuleTimeList().isEmpty()){ if(!dto.getRuleTimeList().isEmpty()){
wrkAuditRule.setRuleTime(String.join(",", dto.getRuleTime())); wrkAuditRule.setRuleTime(String.join(",", dto.getRuleTimeList()));
} }
return this.updateById(wrkAuditRule) ? 1 : 0; return this.updateById(wrkAuditRule) ? 1 : 0;
} else { } else {
@ -127,7 +130,7 @@ public class WrkAuditRuleServiceImpl extends ServiceImpl<WrkAuditRuleMapper, Wrk
wrkAuditRule.setId(IdUtil.getSnowflakeNextId()); wrkAuditRule.setId(IdUtil.getSnowflakeNextId());
wrkAuditRule.setDeptId(SecurityUtils.getDeptId()); wrkAuditRule.setDeptId(SecurityUtils.getDeptId());
wrkAuditRule.setUserId(SecurityUtils.getUserId()); wrkAuditRule.setUserId(SecurityUtils.getUserId());
wrkAuditRule.setRuleTime(String.join(",", dto.getRuleTime())); wrkAuditRule.setRuleTime(String.join(",", dto.getRuleTimeList()));
return this.save(wrkAuditRule) ? 1 : 0; return this.save(wrkAuditRule) ? 1 : 0;
} }
} }