霍煤bug修改；

src/main/java/com/patzn/cloud/service/lims/hmhj/common/consts/HmConst.java

@@ -19,7 +19,7 @@ public class HmConst {
     public static final String THIRD_CODE_MATERIALS = "三级编码物资";
     public static final String EXIST_CODE_MATERIALS = "已有编码物资";
     public static final String SCATTERED = "散样";
-    public static final String SECOND_PERIOD = "一二期";
+    public static final String SECOND_PERIOD = "二期";
     public static final String THIRD_PERIOD = "三期";
     public static final String NO_MATCH = "NO_MATCH";
 

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractInfoController.java

@@ -51,6 +51,20 @@ public class ContractInfoController extends ServiceController {
         return success(contractInfoService.pageVO(getPage(), contractInfo));
     }
 
+    @ApiOperation("合同登记分页列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_ROWS, value = "每页条数", required = true, paramType = "query", dataTypeClass = Integer.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SIDX, value = "排序字段", paramType = "query", dataTypeClass = String.class),
+            @ApiImplicitParam(name = RestConstants.PAGE_SORD, value = "排序方式", paramType = "query", dataTypeClass = String.class),
+    })
+    @PostMapping("/page_reg")
+    public RestResult<Page<ContractInfoVO>> getRegPage(ContractInfoVO contractInfo) {
+        contractInfo.setStatus(ContractInfoStatusEnum.DRAFT);
+        contractInfo.setPeriod(userInfoService.getUserPeriod(getAccount()));
+        return success(contractInfoService.pageVO(getPage(), contractInfo));
+    }
+
     @ApiOperation("合同登记历史分页列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = RestConstants.PAGE_PAGE, value = "请求数据的页码", required = true, paramType = "query", dataTypeClass = Integer.class),

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/ContractSampleController.java

@@ -298,7 +298,8 @@ public class ContractSampleController extends ServiceController {
     @PostMapping("/page_data_sampling")
     public RestResult<Page<ContractSampleVO>> getPageDataSampling(ContractSampleVO contractSample) {
         contractSample.setStatus(ContractSampleStatusEnum.DATA_SAMPLING);
-        contractSample.setCurrUserId(getAccount().getUserId());
+        // contractSample.setCurrUserId(getAccount().getUserId());
+        contractSample.setUserOrgName(userInfoService.getUserPeriod(getAccount()));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
 
@@ -336,6 +337,7 @@ public class ContractSampleController extends ServiceController {
         statusList.add(ContractSampleStatusEnum.OUT_DRIFT);
         statusList.add(ContractSampleStatusEnum.ENTRUST_REG);
         contractSample.setStatusList(statusList);
+        contractSample.setUserOrgName(userInfoService.getUserPeriod(getAccount()));
         return success(contractSampleService.pageVO(getPage(), contractSample));
     }
     // =========================采样管理 end ===================================
@@ -736,6 +738,12 @@ public class ContractSampleController extends ServiceController {
         return success(contractSampleService.updateContractBatch(ids, contractSample, getAccount()));
     }
 
+    @ApiOperation("入库登记完成")
+    @PostMapping("/put_in_reg_end")
+    public RestResult<Boolean> putInRegEnd(ContractSample contractSample) {
+        return success(contractSampleService.updatePutInRegEnd(contractSample, getAccount()));
+    }
+
     @ApiOperation("暂停、启动服务")
     @PostMapping("/suspendOrContinue")
     public RestResult<Boolean> suspendOrContinue(@RequestParam("ids") Long[] ids, @RequestParam("suspend") Integer suspend) {

src/main/java/com/patzn/cloud/service/lims/hmhj/controller/EntrustController.java

@@ -885,7 +885,7 @@ public class EntrustController extends ServiceController {
     public RestResult<Page<EntrustVO>> getPageEntrustEBook(EntrustVO entrust) {
         entrust.setSampleStatus(EntrustSampleStatusEnum.END);
         entrust.setJudgeStatus(2);
-        entrust.setSortOrder(" r.report_send_time desc ");
+        entrust.setSortOrder(" r.report_send_time desc nulls last ");
         return success(entrustService.pageEntrustJudge(getPage(), entrust));
     }
 

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

@@ -86,4 +86,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     Page<ContractSampleVO> pageExpertReview(Page<ContractSampleVO> page, ContractSampleVO contractSample);
 
     boolean submitToDataSampling(Long[] ids, Account account);
+
+    boolean updatePutInRegEnd(ContractSample contractSample, Account account);
 }

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

@@ -258,7 +258,7 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean submitToEntrustOrg(Long[] ids, Account account) {
-        RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交的合同！");
+        samplingHandler(ids);
         ContractSample contractSample = new ContractSample();
         contractSample.setStatus(ContractSampleStatusEnum.ENTRUST_REG);
         contractSample.setProgress(ContractSampleStatusEnum.ENTRUST_REG);
@@ -272,11 +272,19 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return super.update(contractSample, Condition.create().in("id", ids));
     }
 
+    private void samplingHandler(Long[] ids) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要操作的储运合同！");
+        List<ContractSample> sampleList = getBatchIds(Arrays.asList(ids));
+        sampleList.forEach(t -> {
+            List<ContractSampling> samplingList = contractSamplingService.getByContractId(t.getId());
+            RestAssert.fail(CollectionUtils.isEmpty(samplingList), String.format("编号为【%s】的储运合同暂未采样，请先进行采样操作！", t.getCode()));
+        });
+    }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean submitToOutReg(Long[] ids, Account account) {
-        RestAssert.fail(ArrayUtils.isEmpty(ids), "请选择要提交的合同！");
+        samplingHandler(ids);
         ContractSample contractSample = new ContractSample();
         contractSample.setStatus(ContractSampleStatusEnum.OUT_DRIFT);
         contractSample.setProgress(ContractSampleStatusEnum.OUT_DRIFT);
@@ -732,6 +740,18 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return super.update(contractSample, Condition.create().in("id", ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updatePutInRegEnd(ContractSample contractSample, Account account) {
+        RestAssert.fail(null == contractSample.getId(), "请选择要入库的合同！");
+        contractSample.setStatus(ContractSampleStatusEnum.FINISH);
+        contractSample.setProgress(ContractSampleStatusEnum.FINISH);
+        updateById(contractSample);
+        contractSampleRecordService.record(Collections.singletonList(contractSample.getId()), ContractSampleStatusEnum.STORAGE_REGISTER, ContractSampleStatusEnum.FINISH, 0, "储运入库登记完成", account);
+        lmsMsgService.sendMsg("/hmhj/accept_manage/instorage_register", "储运入库完成", "新的储运入库完成任务！", account, null);
+        return true;
+    }
+
     private void backupSampleHandler(Long[] ids, Account account) {
         if (null == ids || 0 == ids.length) {
             return;

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

@@ -13,6 +13,7 @@ import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import com.patzn.cloud.feign.base.client.SysOrgClient;
 import com.patzn.cloud.feign.lims.hmhj.client.LmsChemicalCategoryClient;
 import com.patzn.cloud.service.base.entity.SysOrg;
+import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.entity.ContractSampling;
 import com.patzn.cloud.service.hmhj.entity.UserInspectionCode;
 import com.patzn.cloud.service.hmhj.enums.CodeTypeEnum;
@@ -21,6 +22,7 @@ import com.patzn.cloud.service.lims.chemical.entity.LmsChemicalCategory;
 import com.patzn.cloud.service.lims.hmhj.common.consts.HmConst;
 import com.patzn.cloud.service.lims.hmhj.mapper.ContractSamplingMapper;
 import com.patzn.cloud.service.lims.hmhj.service.ICodeRuleService;
+import com.patzn.cloud.service.lims.hmhj.service.IContractSampleService;
 import com.patzn.cloud.service.lims.hmhj.service.IContractSamplingService;
 import com.patzn.cloud.service.lims.hmhj.service.IUserInspectionCodeService;
 import org.apache.commons.lang3.StringUtils;
@@ -47,6 +49,9 @@ public class ContractSamplingServiceImpl extends BaseServiceImpl<ContractSamplin
     private ICodeRuleService codeRuleService;
 
     @Autowired
+    private IContractSampleService contractSampleService;
+
+    @Autowired
     private LmsChemicalCategoryClient lmsChemicalCategoryClient;
 
     @Autowired
@@ -86,10 +91,12 @@ public class ContractSamplingServiceImpl extends BaseServiceImpl<ContractSamplin
     @Override
     public boolean saveOrUpdateInfoBatch(List<ContractSampling> sampleList) {
         RestAssert.fail(CollectionUtils.isEmpty(sampleList), "样品信息为空");
+        ContractSample contractSample = contractSampleService.getById(sampleList.get(0).getContractSampleId());
         sampleList.forEach(t -> {
             RestAssert.fail(null == t.getType(), "样品类型为空");
             RestAssert.fail(StringUtils.isBlank(t.getName()), "样品名称为空");
             initSamplingCode(t);
+            t.setMaterialId(contractSample.getMaterialId());
         });
         return saveOrUpdateBatch(sampleList);
     }

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

@@ -327,6 +327,11 @@ public class EntrustServiceImpl extends BaseServiceImpl<EntrustMapper, Entrust>
         Entrust entrust = dto.convert(Entrust.class);
         List<EntrustSampleDTO> sampleDTOList = dto.getSampleDTOList();
         RestAssert.fail(CollectionUtils.isEmpty(sampleDTOList), "委托样品为空");
+        Long materialId = sampleDTOList.get(0).getMaterialId();
+        // 赋值 物资ID
+        if (null == entrust.getMaterialId() && null != materialId) {
+            entrust.setMaterialId(materialId);
+        }
         if (null == entrust.getEntrustTime()) {
             entrust.setEntrustTime(new Date());
         }

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

@@ -270,25 +270,27 @@ public class StatisticsServiceImpl extends BaseServiceImpl<StatisticsMapper, Sta
     }
 
     private String getDataLabel(String label, List<String> names) {
-        if (StringUtils.isBlank(label) || CollectionUtils.isEmpty(names)) {
+        if (StringUtils.isBlank(label) || CollectionUtils.isEmpty(names) || null == names.get(0)) {
             return label;
         }
         for (String t : names) {
-            if (label.contains(t)) {
-                return label.replace(t, "");
+            if (StringUtils.isBlank(t) || !label.contains(t)) {
+                continue;
             }
+            return label.replace(t, "");
         }
         return label;
     }
 
     private String getDataName(String label, List<String> names) {
-        if (StringUtils.isBlank(label)) {
+        if (StringUtils.isBlank(label) || CollectionUtils.isEmpty(names) || null == names.get(0)) {
             return "";
         }
         for (String t : names) {
-            if (label.contains(t)) {
-                return t;
+            if (StringUtils.isBlank(t) || !label.contains(t)) {
+                continue;
             }
+            return t;
         }
         return label;
     }

src/main/resources/mapper/hmhj/ContractSamplingMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.EntrustSampleMapper">
-
+<mapper namespace="com.patzn.cloud.service.lims.hmhj.mapper.ContractSamplingMapper">
 
     <select id="selectVOList" resultType="com.patzn.cloud.service.hmhj.vo.ContractSamplingVO">
         SELECT

src/main/resources/mapper/hmhj/StatisticsMapper.xml

@@ -290,6 +290,21 @@
         ORDER BY
             DAY
     </sql>
+
+    <sql id="ledger_where">
+        <if test="null != vo.branch">
+            AND e.branch = #{vo.branch}
+        </if>
+
+        <if test="null != vo.plant">
+            AND e.plant = #{vo.plant}
+        </if>
+
+        <if test="null != vo.partition">
+            and e.partition = #{vo.partition}
+        </if>
+    </sql>
+
     <!--原铝品味台账查询-->
     <select id="selectAlGradeLedger" resultType="com.patzn.cloud.service.hmhj.vo.DailyStatsLedgerVO">
          SELECT
@@ -315,14 +330,7 @@
              AND s.NAME = '原铝'
              AND s.sample_grading IS NOT NULL
              AND i.test_time LIKE '${vo.yearMonth}%'
-
-             <if test="null != vo.branch">
-                 AND e.branch = #{vo.branch}
-             </if>
-
-             <if test="null != vo.partition">
-                 and e.partition = #{vo.partition}
-             </if>
+             <include refid="ledger_where"/>
          ORDER BY
              s.slot_no, i.test_time
     </select>
@@ -351,14 +359,8 @@
              AND s.NAME = '原铝'
              AND s.sample_grading IS NOT NULL
              AND i.test_time LIKE '${vo.yearMonth}%'
+            <include refid="ledger_where"/>
 
-             <if test="null != vo.branch">
-                 AND e.branch = #{vo.branch}
-             </if>
-
-             <if test="null != vo.partition">
-                 and e.partition = #{vo.partition}
-             </if>
          GROUP BY s.sample_grading,i.test_time
          ORDER BY
              s.sample_grading desc, i.test_time
@@ -401,13 +403,7 @@
              AND s.sample_grading IS NOT NULL
              AND i.test_time LIKE '${vo.yearMonth}%'
 
-             <if test="null != vo.branch">
-                 AND e.branch = #{vo.branch}
-             </if>
-
-             <if test="null != vo.partition">
-                 and e.partition = #{vo.partition}
-             </if>
+            <include refid="ledger_where"/>
          ORDER BY
              s.slot_no, i.test_time
     </select>
@@ -459,14 +455,7 @@
             AND s.NAME = '原铝'
             AND s.sample_grading IS NOT NULL
             AND i.test_time LIKE '${vo.yearMonth}%'
-
-            <if test="null != vo.branch">
-                AND e.branch = #{vo.branch}
-            </if>
-
-            <if test="null != vo.partition">
-                and e.partition = #{vo.partition}
-            </if>
+            <include refid="ledger_where"/>
         GROUP BY
             I.test_time
             ) T order by sn , day
@@ -500,21 +489,14 @@
                 AND I.NAME LIKE'%原铝%'
                 AND to_char( i.test_time, 'yyyy-mm-dd' ) like '${vo.yearMonth}%'
                 AND is_numeric ( ii.test_value )
-                <if test="null != vo.branch or null != vo.partition">
+                <if test="null != vo.branch or null != vo.partition or null != vo.plant">
                     AND EXISTS (
                         SELECT
                             1
                         FROM entrust_sample s
                         join electrolyzer e ON e.ID = s.electrolyzer_id
                         WHERE s.deleted = 0 and e.deleted = 0 and s.id = i.entrust_sample_id
-
-                        <if test="null != vo.branch">
-                            AND e.branch = #{vo.branch}
-                        </if>
-
-                        <if test="null != vo.partition">
-                            AND e.partition = #{vo.partition}
-                        </if>
+                        <include refid="ledger_where"/>
                     )
                 </if>
             GROUP BY

src/test/java/resources/db_sql/hmhj/v168/20210928__添加合同表字段.sql

+/** created by meazty on 2021/9/28 16:18 **/
+/** created by meazty on 2021/9/28 16:18 **/
+ALTER TABLE "public"."contract_info"
+    ADD COLUMN "material_id" int8;
+
+COMMENT ON COLUMN "public"."contract_info"."material_id" IS '合同-物质ID';
+
+ALTER TABLE "public"."contract_sample"
+    ADD COLUMN "material_id" int8;
+
+COMMENT ON COLUMN "public"."contract_sample"."material_id" IS '储运合同-物质ID';
\ No newline at end of file