diff --git a/hzims-service-api/common-api/src/main/java/com/hnac/hzims/vo/VoteChartVo.java b/hzims-service-api/common-api/src/main/java/com/hnac/hzims/vo/VoteChartVo.java index adbf9b0..4b96c6a 100644 --- a/hzims-service-api/common-api/src/main/java/com/hnac/hzims/vo/VoteChartVo.java +++ b/hzims-service-api/common-api/src/main/java/com/hnac/hzims/vo/VoteChartVo.java @@ -37,6 +37,6 @@ public class VoteChartVo { @ExcelIgnore private List finishIds; @ApiModelProperty(value = "完成率") - @ExcelProperty(value = "完成率", index = 3) + @ExcelProperty(value = "完成率", index = 4) private Double finishRate; } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/basicScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BasicScheduledTask.java similarity index 90% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/basicScheduledTask.java rename to hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BasicScheduledTask.java index 9b72730..9d6940b 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/basicScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/BasicScheduledTask.java @@ -13,19 +13,22 @@ import com.hnac.hzims.message.fegin.IMessageConfigClient; import com.hnac.hzims.scheduled.mapper.basic.PersonManagemetMapper; import com.hnac.hzims.scheduled.service.basic.IImsCertificatetNoticeService; import com.hnac.hzims.scheduled.service.basic.IImsCertificatetService; +import com.hnac.hzims.scheduled.service.basic.IImsPresonManagementService; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.junit.jupiter.api.Test; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.CollectionUtil; import org.springblade.core.tool.utils.DateUtil; -import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.cache.UserCache; import org.springblade.system.user.entity.User; import org.springblade.system.user.feign.IUserClient; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.text.ParseException; @@ -33,7 +36,7 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import static com.hnac.hzims.operational.main.constant.MainConstants.*; +import static com.hnac.hzims.operational.main.constant.MainConstants.CERTIFICATET_DEAD_LINE_NOTICE; /** @@ -43,7 +46,7 @@ import static com.hnac.hzims.operational.main.constant.MainConstants.*; */ @Slf4j @Component -public class basicScheduledTask { +public class BasicScheduledTask { @Autowired private IImsCertificatetService iImsCertificatetService; @@ -56,7 +59,7 @@ public class basicScheduledTask { @Autowired private IMessageClient messageClient; @Autowired - private PersonManagemetMapper personManagemetMapper; + private IImsPresonManagementService presonManagementService; @Autowired private IMessageConfigClient messageConfigClient; @@ -64,10 +67,12 @@ public class basicScheduledTask { * realId刷新 */ @XxlJob(CERTIFICATET_DEAD_LINE_NOTICE) -// @Scheduled(cron = "0 */1 * * * ? ") +// @Scheduled(cron = "0/40 * * * * ? ") public ReturnT certificatetDeadLineNotice(String param) throws ParseException { +// public ReturnT certificatetDeadLineNotice() throws ParseException { +// String param=""; Date endTime = new Date(); - if (Func.isBlank(param)) { + if (StringUtils.isNotBlank(param)) { endTime = new SimpleDateFormat("yyyy-MM-dd").parse(param); } CertificatetNoticeEntity noticeEntity = iImsCertificatetNoticeService.getOne(Wrappers.lambdaQuery() @@ -81,7 +86,7 @@ public class basicScheduledTask { List userList = Arrays.asList(noticeUsers.split(",")); if (CollectionUtil.isNotEmpty(userList) && CollectionUtil.isNotEmpty(list)) { List personIds = list.stream().map(CertificatetEntity::getPersonId).collect(Collectors.toList()); - List personManagemetEntities = personManagemetMapper.selectList(Wrappers.query().lambda().in(PersonManagemetEntity::getId, personIds)); + List personManagemetEntities = presonManagementService.list(Wrappers.query().lambda().in(PersonManagemetEntity::getId, personIds)); String personNotice=""; if (CollectionUtil.isNotEmpty(personManagemetEntities)) { personNotice = personManagemetEntities.stream().map(PersonManagemetEntity::getName).collect(Collectors.joining(",")); @@ -93,7 +98,6 @@ public class basicScheduledTask { } return new ReturnT<>("SUCCESS"); } - private void sendSmsByUserList(List userList, Date date,String personNotice) { //区分用户 for (String s : userList) { diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/IImsPresonManagementService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/IImsPresonManagementService.java new file mode 100644 index 0000000..bc00a78 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/IImsPresonManagementService.java @@ -0,0 +1,21 @@ +package com.hnac.hzims.scheduled.service.basic; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.hnac.hzims.basic.entity.PersonManagemetEntity; +import com.hnac.hzims.basic.vo.PersonManagemetExportVo; +import com.hnac.hzims.basic.vo.PersonManagemetVo; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; + +import java.util.List; + +/** + * 服务类 + * + * @author Chill + */ +public interface IImsPresonManagementService extends IService { + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java index b4e956d..f1b2210 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetNoticeServiceImpl.java @@ -1,5 +1,6 @@ package com.hnac.hzims.scheduled.service.basic.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hnac.hzims.basic.entity.CertificatetNoticeEntity; import com.hnac.hzims.scheduled.mapper.basic.CertificatetNoticeMapper; import com.hnac.hzims.scheduled.service.basic.IImsCertificatetNoticeService; @@ -17,5 +18,6 @@ import org.springframework.stereotype.Service; @Service @Slf4j @RequiredArgsConstructor +@DS("basic") public class CertificatetNoticeServiceImpl extends BaseServiceImpl implements IImsCertificatetNoticeService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java index 8849e80..79b890c 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/CertificatetServiceImpl.java @@ -1,5 +1,6 @@ package com.hnac.hzims.scheduled.service.basic.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.hnac.hzims.basic.entity.CertificatetEntity; import com.hnac.hzims.scheduled.mapper.basic.CertificatetMapper; import com.hnac.hzims.scheduled.service.basic.IImsCertificatetService; @@ -17,5 +18,6 @@ import org.springframework.stereotype.Service; @Service @Slf4j @RequiredArgsConstructor +@DS("basic") public class CertificatetServiceImpl extends BaseServiceImpl implements IImsCertificatetService { } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/PresonManagementServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/PresonManagementServiceImpl.java new file mode 100644 index 0000000..04b2f84 --- /dev/null +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/basic/impl/PresonManagementServiceImpl.java @@ -0,0 +1,27 @@ +package com.hnac.hzims.scheduled.service.basic.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hnac.hzims.basic.entity.PersonManagemetEntity; +import com.hnac.hzims.scheduled.mapper.basic.PersonManagemetMapper; +import com.hnac.hzims.scheduled.service.basic.IImsPresonManagementService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springframework.stereotype.Service; + + + +/** + * 人员信息实现类 + * + * @author ty + */ +@Service +@Slf4j +@RequiredArgsConstructor +@DS("basic") +public class PresonManagementServiceImpl extends BaseServiceImpl implements IImsPresonManagementService { + + + +} diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/CertificatetMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/basic/CertificatetMapper.xml similarity index 100% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/CertificatetMapper.xml rename to hzims-service/hzims-scheduled/src/main/resources/mapper/basic/CertificatetMapper.xml diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/CertificatetNoticeMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/basic/CertificatetNoticeMapper.xml similarity index 100% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/CertificatetNoticeMapper.xml rename to hzims-service/hzims-scheduled/src/main/resources/mapper/basic/CertificatetNoticeMapper.xml diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/PersonManagemetMapper.xml b/hzims-service/hzims-scheduled/src/main/resources/mapper/basic/PersonManagemetMapper.xml similarity index 100% rename from hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/basic/PersonManagemetMapper.xml rename to hzims-service/hzims-scheduled/src/main/resources/mapper/basic/PersonManagemetMapper.xml diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java index 455e33f..064ce83 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java @@ -1166,8 +1166,8 @@ public class TaskServiceImpl extends BaseServiceImpl imp if (CollectionUtil.isEmpty(list)||CollectionUtil.isEmpty(undoneIds)){ voteChartVo.setFinishRate(0.00d); }else { - BigDecimal divide = new BigDecimal(list.size()).divide(new BigDecimal(list.size()),2,BigDecimal.ROUND_UP); - voteChartVo.setFinishRate( divide.doubleValue()); + BigDecimal divide = new BigDecimal(finishIds.size()).divide(new BigDecimal(list.size()),2,BigDecimal.ROUND_UP); + voteChartVo.setFinishRate(divide.doubleValue()); } return voteChartVo; } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java index 29cda63..1a55a22 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/twoTicket/service/impl/TicketProcessServiceImpl.java @@ -516,7 +516,7 @@ public class TicketProcessServiceImpl implements TicketProcessService { contentService.saveOrUpdateBatch(workTicketContentDtoList); } WorkTicketFinish workTicketFinish = workTicketVo.getWorkTicketFinish(); - if(CollectionUtil.isNotEmpty(workTicketContentDtoList)) { + if(ObjectUtil.isNotEmpty(workTicketFinish)) { workTicketFinishService.saveOrUpdate(workTicketFinish); } // 推送消息