霍煤宏骏

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

 package com.patzn.cloud.service.lims.hmhj.controller;
 import com.google.common.collect.Lists;
 import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
+import com.patzn.cloud.service.hmhj.dto.ContractSampleVODTO;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
@@ -577,10 +578,10 @@ public class ContractSampleController extends ServiceController {
     }
 
 
-//    @ApiOperation("二次判定审核通过")
-//    @PostMapping("/pass_second_judge_check")
-//    public RestResult<Boolean> passToSecondJudgeCheck(@RequestParam("ids")Long [] ids) {
-//        return success(contractSampleService.submitToSecondJudgeCheck(ids,getAccount()));
-//    }
+    @ApiOperation("二次判定审核通过")
+    @PostMapping("/pass_second_judge_check")
+    public RestResult<Boolean> passToSecondJudgeCheck(@RequestBody ContractSampleVODTO dto) {
+        return success(contractSampleService.passToSecondJudgeCheck(dto,getAccount()));
+    }
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.commons.service.IBaseService;
 import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
+import com.patzn.cloud.service.hmhj.dto.ContractSampleVODTO;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 
@@ -62,4 +63,6 @@ public interface IContractSampleService extends IBaseService<ContractSample> {
     boolean submitToSecondJudgeCheck(Long[] ids, Account account);
 
     boolean backSecondJudgeCheck(Long[] ids, String reason, Account account);
+
+    boolean passToSecondJudgeCheck(ContractSampleVODTO dto, Account account);
 }

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

@@ -5,16 +5,17 @@ import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.patzn.cloud.commons.api.RestAssert;
 import com.patzn.cloud.commons.controller.Account;
 import com.patzn.cloud.service.hmhj.dto.ContractSampleDTO;
+import com.patzn.cloud.service.hmhj.dto.ContractSampleVODTO;
 import com.patzn.cloud.service.hmhj.entity.ContractSample;
 import com.patzn.cloud.service.hmhj.entity.ContractSampleItem;
 import com.patzn.cloud.service.hmhj.entity.ContractSampleRecord;
+import com.patzn.cloud.service.hmhj.entity.EntrustSample;
 import com.patzn.cloud.service.hmhj.enums.ContractSampleStatusEnum;
+import com.patzn.cloud.service.hmhj.enums.EntrustSampleStatusEnum;
 import com.patzn.cloud.service.hmhj.vo.ContractSampleVO;
 import com.patzn.cloud.service.lims.common.service.ILmsMsgService;
 import com.patzn.cloud.service.lims.hmhj.mapper.ContractSampleMapper;
-import com.patzn.cloud.service.lims.hmhj.service.IContractSampleItemService;
-import com.patzn.cloud.service.lims.hmhj.service.IContractSampleRecordService;
-import com.patzn.cloud.service.lims.hmhj.service.IContractSampleService;
+import com.patzn.cloud.service.lims.hmhj.service.*;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -25,6 +26,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -42,6 +44,13 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
     private IContractSampleRecordService contractSampleRecordService;
 
 
+
+    @Autowired
+    private IEntrustSampleService entrustSampleService;
+
+
+
+
     @Autowired
     private IContractSampleItemService contractSampleItemService;
 
@@ -333,5 +342,32 @@ public class ContractSampleServiceImpl extends BaseServiceImpl<ContractSampleMap
         return true;
     }
 
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean passToSecondJudgeCheck(ContractSampleVODTO dto, Account account) {
+        RestAssert.fail(null == dto,"数据有误");
+        List<ContractSampleVO> voList = dto.getDtoList();
+        RestAssert.fail(CollectionUtils.isEmpty(voList),"请选择通过的数据！");
+
+        for (ContractSampleVO sampleVO : voList) {
+            RestAssert.fail(null == sampleVO.getId(),"数据有误！");
+            RestAssert.fail(null == sampleVO.getEntrustId(),"数据有误！");
+        }
+
+        List<Long> idsList=new ArrayList<>();
+        List<Long> entrustIdsList=new ArrayList<>();
+        for (ContractSampleVO sampleVO : voList) {
+            idsList.add(sampleVO.getId());
+            entrustIdsList.add(sampleVO.getEntrustSampleId());
+        }
+
+        EntrustSample sample = new EntrustSample();
+        sample.setStatus(EntrustSampleStatusEnum.END);
+        sample.setProgress(EntrustSampleStatusEnum.END);
+        sample.setJudgeStatus(0);
+        entrustSampleService.update(sample,Condition.create().in("id",entrustIdsList));
+        return true;
+    }
+
 
 }

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

@@ -52,7 +52,7 @@
         JOIN entrust e ON t.entrust_id = e.id
 
 
-         WHERE s.deleted = 0
+         WHERE s.deleted = 0 AND t.judge_status NOT IN (0,1)
         <include refid="sqlWhere"/>
     </select>
 

src/test/java/resources/db_sql/base/v112/新增菜单.sql

+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1397149938870833153, 1356148880450674689, 1366208464993296386, '二次判定审核', 0, 'determine_audit', '/hmhj/quality_manage/determine_audit', 'pt-config', NULL, 1, 6, '2021-05-25 19:17:57.889', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1397149938870833153, 1356148880450674689, 1366208464993296386, '二次判定审核', 0, 'determine_audit', '/hmhj/quality_manage/determine_audit', 'pt-config', NULL, 1, 6, '2021-05-25 19:17:57.889', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1397149709052334082, 1356148880450674689, 1366208464993296386, '二次判定维护', 0, 'determine_maintenance', '/hmhj/quality_manage/determine_maintenance', 'pt-config', NULL, 1, 7, '2021-05-25 19:17:03.089', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1397148355101642754, 1356148880450674689, 1366208464993296386, '验收结果发布', 0, 'result_release', '/hmhj/quality_manage/result_release', 'pt-config', NULL, 1, 8, '2021-05-25 19:11:40.36', NULL);
+INSERT INTO "public"."sys_resource" ("id", "system_id", "pid", "name", "type", "code", "uri", "icon", "remark", "status", "sort", "ctime", "ename") VALUES (1393014947140304898, 1356148880450674689, 1358324885470748673, '产品标准管理', 0, 'product_manage', '/hmhj/aptitude_manage/product_manage', 'pt-config', NULL, 1, 90, '2021-05-14 09:26:59.055', NULL);