添加定时创建委托功能；

src/main/java/com/patzn/cloud/service/lims/config/JobsConfig.java

@@ -7,8 +7,8 @@ import org.springframework.context.annotation.Configuration;
  * @author dingzg
  * @since 2019/10/18
  */
-//@EnableJobs
-//@Configuration
+@EnableJobs
+@Configuration
 public class JobsConfig {
 
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/handler/EntrustCreateJobsHandler.java

+package com.patzn.cloud.service.lims.hmhj.handler;
+
+import com.baomidou.jobs.api.JobsResponse;
+import com.baomidou.jobs.exception.JobsException;
+import com.baomidou.jobs.handler.IJobsHandler;
+import com.patzn.cloud.service.lims.hmhj.service.IEntrustService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 定时创建委托任务
+ *
+ * @author meazty
+ * @since 2023/5/17 11:59
+ **/
+@Component("EntrustCreateJobsHandler")
+public class EntrustCreateJobsHandler implements IJobsHandler {
+
+    private static final Logger logger = LoggerFactory.getLogger(EntrustCreateJobsHandler.class);
+
+    private final IEntrustService entrustService;
+
+    public EntrustCreateJobsHandler(IEntrustService entrustService) {
+        this.entrustService = entrustService;
+    }
+
+    @Override
+    public JobsResponse execute(String tenantId, String param) throws JobsException {
+        try {
+            logger.info("==== EntrustCreateJobsHandler ==== execute ====> [tenantId, param]: {},{}", tenantId, param);
+            long userId = StringUtils.isBlank(param) ? 0L : Long.parseLong(param);
+            entrustService.createEntrustAuto(Long.parseLong(tenantId), userId);
+        } catch (Exception e) {
+            logger.error("定时任务质控计划预警提醒异常", e);
+        }
+        return JobsResponse.ok();
+    }
+
+}

src/main/java/com/patzn/cloud/service/lims/hmhj/handler/ProgressEntity.java

-package com.patzn.cloud.service.lims.hmhj.handler;
-
-public class ProgressEntity {
-    private String date;
-    private String content;
-
-    public String getDate() {
-        return date;
-    }
-
-    public void setDate(String date) {
-        this.date = date;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-}

src/main/java/com/patzn/cloud/service/lims/hmhj/handler/ItemCollectEntity.java → src/main/java/com/patzn/cloud/service/lims/hmhj/handler/collects/ItemCollectEntity.java

-package com.patzn.cloud.service.lims.hmhj.handler;
+package com.patzn.cloud.service.lims.hmhj.handler.collects;
 
 public class ItemCollectEntity {
      private String itemName;

src/main/java/com/patzn/cloud/service/lims/hmhj/handler/SoilItemCollectData.java → src/main/java/com/patzn/cloud/service/lims/hmhj/handler/collects/SoilItemCollectData.java

-package com.patzn.cloud.service.lims.hmhj.handler;
+package com.patzn.cloud.service.lims.hmhj.handler.collects;
 
 public class SoilItemCollectData {
      private String itemName;

src/main/java/com/patzn/cloud/service/lims/hmhj/handler/QuestionnaireExportHandler.java → src/main/java/com/patzn/cloud/service/lims/hmhj/handler/exports/QuestionnaireExportHandler.java

-package com.patzn.cloud.service.lims.hmhj.handler;
+package com.patzn.cloud.service.lims.hmhj.handler.exports;
 
 import com.patzn.cloud.service.hmhj.entity.Questionnaire;
 import com.patzn.poibox.excel.AbstractExeclExportHandler;
@@ -10,7 +10,7 @@ import java.util.Map;
 
 public class QuestionnaireExportHandler extends AbstractExeclExportHandler {
 
-    private List<Questionnaire> questionnaires = null;
+    private List<Questionnaire> questionnaires;
 
     public QuestionnaireExportHandler(List<Questionnaire> equipList) {
         this.questionnaires = equipList;

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IEntrustService.java

@@ -123,4 +123,6 @@ public interface IEntrustService extends IBaseService<Entrust> {
 
     Boolean confirmRecheck(EntrustDTO entrustDTO, Account account);
 
+    Boolean createEntrustAuto(Long companyId,Long userId);
+
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/IMaterialService.java

@@ -23,4 +23,6 @@ public interface IMaterialService extends IBaseService<Material> {
     boolean removeByIds(List<Long> ids);
 
     Page<Material> getPageMaterialByPerson(Page<Material> page, Material material, String bizType, Account account);
+
+    Material getMaterialByData(String code, String name, Long relUserId);
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/CodeRuleRecordServiceImpl.java

@@ -26,8 +26,7 @@ public class CodeRuleRecordServiceImpl extends BaseServiceImpl<CodeRuleRecordMap
 
     @Override
     public Page<CodeRuleRecord> page(Page<CodeRuleRecord> page, CodeRuleRecord codeRuleRecord) {
-        Wrapper wrapper = new EntityWrapper<>(codeRuleRecord);
-
+        Wrapper<CodeRuleRecord> wrapper = new EntityWrapper<>(codeRuleRecord);
         return this.page(page, wrapper);
     }
 
@@ -67,6 +66,7 @@ public class CodeRuleRecordServiceImpl extends BaseServiceImpl<CodeRuleRecordMap
             crr.setCodeRuleId(codeRuleId);
             crr.setSn(1);
             crr.setVary(vary);
+            crr.setCompanyId(codeRule.getCompanyId());
             if (super.save(crr)) {
                 return 1;
             }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/EntrustServiceImpl.java

@@ -94,6 +94,8 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
     @Resource
     private IMaterialService materialService;
     @Resource
+    private IMaterialItemService materialItemService;
+    @Resource
     private IContractSamplingService contractSamplingService;
     @Resource
     private IOriginalRecordService originalRecordService;
@@ -106,6 +108,12 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
     @Resource
     private RedisTemplate<String, String> redisTemplate;
 
+    @Resource
+    private IClientInfoService clientInfoService;
+
+    @Resource
+    private IClientTestSideService clientTestSideService;
+
 
     @Override
     public Page<Entrust> page(Page<Entrust> page, Entrust entrust) {
@@ -176,6 +184,20 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         return save(entrust);
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    public boolean saveEntrust(Entrust entrust, Long userId) {
+        String entrustCode = codeRuleService.getKey((Integer) CodeTypeEnum.ENTRUST_CODE.getValue(), CodeTypeEnum.ENTRUST_CODE.getName(), entrust);
+        if (StringUtils.isNotEmpty(entrustCode)) {
+            entrust.setCode(entrustCode);
+        }
+        // 根据当前用户，设置委托期数
+        if (StringUtils.isBlank(entrust.getPeriod())) {
+            Account account = new Account().setUserId(userId);
+            entrust.setPeriod(userInfoService.getUserPeriod(account));
+        }
+        return save(entrust);
+    }
+
     public boolean isExistSampleCode(EntrustSample sample) {
         String category = sample.getCategory();
         RestAssert.fail(StringUtils.isBlank(category), "样品类型为空");
@@ -1957,4 +1979,135 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         return true;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean createEntrustAuto(Long companyId, Long userId) {
+        Account account = new Account();
+        account.setUserId(userId).setUserName("管理员");
+        Entrust entrust = getLatestEntrust("原铝", userId, companyId);
+        Long sourceId = entrust.getId();
+        // 初始化部分字段信息
+        entrust.setAssignorId(userId)
+                .setAssignor(account.getUserName())
+                .setReceiver(account.getUserName())
+                .setStatus(EntrustStatusEnum.DRAFT)
+                .setProgress(EntrustStatusEnum.DRAFT)
+                .setType(0)
+                .setTestAsk("符合")
+                .setPriority("常规")
+                .setSpecialAsk("否")
+                .setLiveWitness(0)
+                .setEntrustTime(new Date())
+                .setReceiveTime(new Date())
+                .setExpectSendTime(new Date())
+                .setSampleHandleAdvise("同意留样")
+                .setCompanyId(companyId);
+        if (StringUtils.isBlank(entrust.getPeriod())) {
+            entrust.setPeriod("三期");
+        }
+        // 查询匹配物料
+        Material m = materialService.getMaterialByData("A0001", null, null);
+        // 查询委托样品信息
+        List<EntrustSample> samples = new ArrayList<>();
+        // 查询样品检测项目
+        List<EntrustSampleItem> items = new ArrayList<>();
+
+        if (Objects.isNull(sourceId)) {
+            entrust.setMaterialId(m.getId());
+        } else {
+            samples = entrustSampleService.getByEntrustId(sourceId);
+            items = entrustSampleItemService.getListByEntrustId(sourceId);
+        }
+        // 检测项目与样品关系
+        Map<Long, List<EntrustSampleItem>> sampleItemsMap = new LinkedHashMap<>(6);
+        if (CollectionUtils.isNotEmpty(items)) {
+            items.forEach(it -> MapMergeUtils.getorCreateMapArrayList(it.getEntrustSampleId(), sampleItemsMap, it));
+        }
+
+        List<EntrustSample> sampleList = new ArrayList<>();
+        List<EntrustSampleItem> itemList = new ArrayList<>();
+        // 查询匹配物料项目
+        List<MaterialItem> materialItems = materialItemService.list(Condition.<MaterialItem>wrapper().eq("material_id", m.getId()));
+
+        entrust.setId(IdWorker.getId());
+        saveEntrust(entrust, userId);
+        if (CollectionUtils.isNotEmpty(samples)) {
+            for (int i = 0; i < samples.size(); i++) {
+                EntrustSample s = samples.get(i);
+                List<EntrustSampleItem> insertItems = sampleItemsMap.get(s.getId());
+                s.setId(IdWorker.getId());
+                s.setName(m.getName())
+                        .setEntrustId(entrust.getId())
+                        .setStatus(EntrustSampleStatusEnum.DRAFT)
+                        .setProgress(EntrustSampleStatusEnum.DRAFT)
+                        .setOrderBy(i * 5)
+                        .setEntrustId(entrust.getId())
+                        .setCompanyId(companyId);
+                sampleList.add(s);
+
+                for (EntrustSampleItem it : insertItems) {
+                    it.setId(IdWorker.getId());
+                    it.setEntrustId(s.getEntrustId()).setEntrustSampleId(s.getId())
+                            .setStatus(EntrustSampleItemStatusEnum.DRAFT)
+                            .setProgress(EntrustSampleItemStatusEnum.DRAFT)
+                            .setCompanyId(companyId);
+                }
+                if (CollectionUtils.isNotEmpty(insertItems)) {
+                    itemList.addAll(insertItems);
+                }
+            }
+        } else {
+            // 随机创建样品数
+            int num = (int) (Math.random() * 10 + 1);
+            for (int i = 0; i < num; i++) {
+                EntrustSample s = new EntrustSample();
+                s.setId(IdWorker.getId());
+                s.setName(m.getName()).setCategory(m.getCategory())
+                        .setEntrustId(entrust.getId())
+                        .setStatus(EntrustSampleStatusEnum.DRAFT)
+                        .setProgress(EntrustSampleStatusEnum.DRAFT)
+                        .setNameCode(m.getCode())
+                        .setStandard(m.getStandard())
+                        .setOrderBy(i * 5)
+                        .setEntrustId(entrust.getId())
+                        .setCompanyId(companyId);
+                sampleList.add(s);
+                for (MaterialItem item : materialItems) {
+                    EntrustSampleItem it = new EntrustSampleItem();
+                    it.setName(item.getName())
+                            .setEntrustId(s.getEntrustId()).setEntrustSampleId(s.getId())
+                            .setStatus(EntrustSampleItemStatusEnum.DRAFT)
+                            .setProgress(EntrustSampleItemStatusEnum.DRAFT)
+                            .setStandard(item.getStandard())
+                            .setGroupId(item.getGroupId())
+                            .setGroupName(item.getGroupName())
+                            .setCompanyId(companyId);
+                    itemList.add(it);
+                }
+            }
+        }
+
+        if (CollectionUtils.isNotEmpty(sampleList)) {
+            entrustSampleService.saveBatch(sampleList);
+        }
+        if (CollectionUtils.isNotEmpty(itemList)) {
+            entrustSampleItemService.saveBatch(itemList);
+        }
+        return true;
+    }
+
+    private Entrust getLatestEntrust(String sampleName, Long userId, Long companyId) {
+        Wrapper<Entrust> wrapper = Condition.wrapper();
+        wrapper.eq(StringUtils.isNotBlank(sampleName), "sample_name", sampleName);
+        wrapper.eq("company_id", companyId);
+        wrapper.eq("uid", userId);
+        wrapper.orderDesc(Collections.singleton("ctime"));
+        List<Entrust> entrustList = list(wrapper);
+        Entrust entrust = new Entrust();
+        if (CollectionUtils.isNotEmpty(entrustList)) {
+            entrust = entrustList.get(0);
+        }
+        return entrust;
+    }
+
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/MaterialServiceImpl.java

 package com.patzn.cloud.service.lims.hmhj.service.impl;
 
+import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.service.hmhj.entity.Material;
+import com.patzn.cloud.service.hmhj.enums.BusinessStaffEnum;
 import com.patzn.cloud.service.lims.hmhj.mapper.MaterialMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IMaterialService;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 物资表 服务实现类
@@ -67,4 +71,26 @@ public class MaterialServiceImpl extends BaseServiceImpl<MaterialMapper, Materia
         wrapper.exists("select 1 from business_staff s where s.deleted = 0 and s.biz_id = material.id and s.biz_type = '" + bizType + "' and s.staff_id = " + account.getUserId());
         return page(page, material, wrapper);
     }
+
+    @Override
+    public Material getMaterialByData(String code, String name, Long relUserId) {
+        Material m = new Material();
+        if (StringUtils.isBlank(code) && StringUtils.isBlank(name) && Objects.isNull(relUserId)) {
+            return m;
+        }
+        Wrapper<Material> wrapper = Condition.wrapper();
+        if (StringUtils.isNotBlank(code)) {
+            wrapper.eq("code", code);
+        }
+        if (StringUtils.isNotBlank(name)) {
+            wrapper.eq("name", name);
+        }
+
+        if (Objects.nonNull(relUserId)) {
+            String bizType = BusinessStaffEnum.ASSIGNOR.getName();
+            wrapper.exists("select 1 from business_staff s where s.deleted = 0 and s.biz_id = material.id and s.biz_type = '" + bizType + "' and s.staff_id = " + relUserId);
+        }
+        List<Material> materialList = list(wrapper);
+        return CollectionUtils.isNotEmpty(materialList) ? materialList.get(0) : m;
+    }
 }

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/OriginalTemplateServiceImpl.java

@@ -13,8 +13,8 @@ import com.patzn.cloud.service.hmhj.entity.*;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemIndexVO;
 import com.patzn.cloud.service.hmhj.vo.EntrustSampleItemVO;
 import com.patzn.cloud.service.lims.hmhj.common.HSSFWorkbookUtil;
-import com.patzn.cloud.service.lims.hmhj.handler.ItemCollectEntity;
-import com.patzn.cloud.service.lims.hmhj.handler.SoilItemCollectData;
+import com.patzn.cloud.service.lims.hmhj.handler.collects.ItemCollectEntity;
+import com.patzn.cloud.service.lims.hmhj.handler.collects.SoilItemCollectData;
 import com.patzn.cloud.service.lims.hmhj.mapper.OriginalTemplateMapper;
 import com.patzn.cloud.service.lims.hmhj.service.*;
 import org.apache.commons.collections.CollectionUtils;

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/QuestionnaireServiceImpl.java

@@ -19,7 +19,7 @@ import com.patzn.cloud.service.hmhj.vo.QuestionnaireStatsVO;
 import com.patzn.cloud.service.hmhj.vo.QuestionnaireVO;
 import com.patzn.cloud.service.lims.base.entity.LmsBaseDict;
 import com.patzn.cloud.service.lims.common.service.IExportService;
-import com.patzn.cloud.service.lims.hmhj.handler.QuestionnaireExportHandler;
+import com.patzn.cloud.service.lims.hmhj.handler.exports.QuestionnaireExportHandler;
 import com.patzn.cloud.service.lims.hmhj.mapper.QuestionnaireMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IQuestionnaireService;
 import org.apache.poi.xssf.usermodel.XSSFRow;
@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -62,11 +63,11 @@ public class QuestionnaireServiceImpl extends BaseServiceImpl<QuestionnaireMappe
     public boolean saveOrUpdate(Questionnaire questionnaire, Account account) {
 
         calcScore(questionnaire);
-        List<SysUserOrgVO> list = sysUserClient.getUserOrg(Arrays.asList(account.getUserId())).serviceData();
+        List<SysUserOrgVO> list = sysUserClient.getUserOrg(Collections.singletonList(account.getUserId())).serviceData();
         SysUserOrgVO sysUserOrgVO = list.get(0);
         questionnaire.setOrgName(sysUserOrgVO.getOrgName());
         questionnaire.setLid(account.getUserId());
-        if (null != questionnaire.getStatus() && 1 == questionnaire.getStatus().intValue()) {
+        if (null != questionnaire.getStatus() && 1 == questionnaire.getStatus()) {
             questionnaire.setSubmitTime(new Date());
             questionnaire.setCreator(account.getUserName());
             submitHandler(account);
@@ -79,7 +80,7 @@ public class QuestionnaireServiceImpl extends BaseServiceImpl<QuestionnaireMappe
 
     @Override
     public Page<Questionnaire> page(Page<Questionnaire> page, QuestionnaireVO questionnaireVO) {
-        Wrapper wrapper = new EntityWrapper<>(new Questionnaire());
+        Wrapper<Questionnaire> wrapper = new EntityWrapper<>(new Questionnaire());
         if (StringUtils.isNotEmpty(questionnaireVO.getCreator())) {
             wrapper.like("creator", questionnaireVO.getCreator());
         }
@@ -119,7 +120,7 @@ public class QuestionnaireServiceImpl extends BaseServiceImpl<QuestionnaireMappe
     private void submitHandler(Account account) {
         LmsBaseDict baseDict = lmsBaseDictClient.getByType(DICT_TYPE, account.getCompanyId()).getData();
         RestAssert.fail(null == baseDict, "未配置满意度调查间隔时间，请先配置默认间隔时间");
-        Integer seqDays = Integer.parseInt(baseDict.getCode());
+        int seqDays = Integer.parseInt(baseDict.getCode());
         List<Questionnaire> questionnaireList = list(Condition.create().eq("status", 1).orderBy("ltime", false));
         if (CollectionUtils.isNotEmpty(questionnaireList)) {
             Questionnaire q = questionnaireList.get(0);
@@ -188,7 +189,7 @@ public class QuestionnaireServiceImpl extends BaseServiceImpl<QuestionnaireMappe
             row.getCell(2).setCellValue(numTotal);
             row.getCell(3).setCellValue(avgValue);
         }
-        String fileName = null;
+        String fileName;
         try {
             fileName = java.net.URLEncoder.encode("客户满意度调查表", "UTF-8");
         } catch (UnsupportedEncodingException e) {

src/main/java/com/patzn/cloud/service/lims/hmhj/service/impl/UserInfoServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.controller.LoginHelper;
+import com.patzn.cloud.commons.toolkit.JacksonUtils;
 import com.patzn.cloud.feign.base.client.SysOrgClient;
 import com.patzn.cloud.feign.base.client.SysUserClient;
 import com.patzn.cloud.feign.lims.base.client.LmsUserGroupClient;
@@ -67,7 +68,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
         if (CollectionUtils.isEmpty(userGroups)) {
             return OTHER_GROUP_NAME_LIST;
         }
-        return getGroupList(userId).stream().map(t -> t.getName()).filter(t -> StringUtils.isNotBlank(t)).collect(Collectors.toList());
+        return getGroupList(userId).stream().map(LmsUserGroup::getName).filter(StringUtils::isNotBlank).collect(Collectors.toList());
     }
 
     @Override
@@ -141,7 +142,13 @@ public class UserInfoServiceImpl implements IUserInfoService {
     @Override
     public SysOrg getUserOrg(Account account) {
         List<SysOrg> orgList = sysOrgClient.getListByUserId(account.getUserId()).getData();
-        return CollectionUtils.isNotEmpty(orgList) ? orgList.get(0) : null;
+        SysOrg sysOrg = new SysOrg();
+        if (CollectionUtils.isNotEmpty(orgList)) {
+            sysOrg = orgList.get(0);
+        }
+        String key = "USER_ORG_" + account.getUserId();
+        redisTemplate.opsForValue().set(key, JacksonUtils.toJSONString(sysOrg));
+        return sysOrg;
     }
 
     @Override
@@ -260,7 +267,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
         String parent = periods[0].replace("（", "").replace("）", "")
                 .replace("一二期", "").replace("二期", "");
 
-        List<String> list = Arrays.stream(periods).filter(t -> userOrgNameList.contains(t)).collect(Collectors.toList());
+        List<String> list = Arrays.stream(periods).filter(userOrgNameList::contains).collect(Collectors.toList());
 
         if (CollectionUtils.isEmpty(list)) {
             // 为空的前提下，若能匹配父级，那么返回父级

src/main/resources/application.yml

@@ -102,9 +102,10 @@ standard:
     ConnectTimeout: 100000
 
 ### jobs
-#jobs:
-#  app-name: soil
-#  app-port: 8026
+jobs:
+  app-ip: ${network-ip:${spring.cloud.client.ip-address}}
+  app-name: ${spring.application.name:hmhj}
+  app-port: 18062
 
 #mybatis
 mybatis-plus: