HMHJ检测标准增加作废

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

@@ -338,7 +338,7 @@ public class EntrustController extends ServiceController {
     public RestResult<Page<EntrustVO>> getPageEntrustSampleReceive(EntrustVO entrust) {
         entrust.setPrepareStatus(EntrustSamplePrepareStatusEnum.RECEIVE);
         // 设置用户编组
-        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
+        //entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustSampleReceive(getPage(), entrust));
     }
 
@@ -372,7 +372,7 @@ public class EntrustController extends ServiceController {
     public RestResult<Page<EntrustVO>> getPageTaskAllot(EntrustVO entrust) {
         entrust.setItemStatus(EntrustSampleItemStatusEnum.ALLOT);
         // 获取当前用户分组
-        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
+        //entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItem(getPage(), entrust));
     }
 
@@ -410,7 +410,7 @@ public class EntrustController extends ServiceController {
     public RestResult<Page<EntrustVO>> getPageTaskTest(EntrustVO entrust) {
         entrust.setItemStatus(EntrustSampleItemStatusEnum.TEST);
         // 获取当前用户分组
-        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
+//        entrust.setGroupNameList(userInfoService.getCurGroupNameList());
         return success(entrustService.pageEntrustByItem(getPage(), entrust));
     }
 

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

@@ -83,4 +83,12 @@ public class StandardController extends ServiceController {
 	public RestResult<Boolean> delete(@RequestParam("ids") List<Long> ids) {
         return success(standardService.removeByIds(ids));
 	}
+
+
+
+    @ApiOperation("作废")
+    @PostMapping("/abolish_standard")
+    public RestResult<Boolean> abolish(@RequestParam("ids")Long [] ids, @RequestParam("reason")String reason) {
+        return success(standardService.abolish(ids,reason,getAccount()));
+    }
 }

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

 package com.patzn.cloud.service.lims.hmhj.service;
 
 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.entity.Standard;
 
@@ -17,4 +18,6 @@ public interface IStandardService extends IBaseService<Standard> {
     Page<Standard> page(Page<Standard> page, Standard standard);
 
     boolean removeByIds(List<Long> ids);
+
+    boolean abolish(Long[] ids, String reason, Account account);
 }

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

 package com.patzn.cloud.service.lims.hmhj.service.impl;
 
 import com.baomidou.mybatisplus.mapper.Condition;
+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.entity.GradingRecord;
+import com.patzn.cloud.service.hmhj.entity.GradingStandard;
 import com.patzn.cloud.service.hmhj.entity.Standard;
 import com.patzn.cloud.service.lims.hmhj.mapper.StandardMapper;
 import com.patzn.cloud.service.lims.hmhj.service.IStandardService;
 import com.patzn.cloud.commons.service.impl.BaseServiceImpl;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -32,4 +41,23 @@ public class StandardServiceImpl extends BaseServiceImpl<StandardMapper, Standar
     public boolean removeByIds(List<Long> ids) {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public boolean abolish(Long[] ids, String reason, Account account) {
+        RestAssert.fail(ArrayUtils.isEmpty(ids),"请选择需要作废的检测标准");
+        RestAssert.fail(StringUtils.isBlank(reason),"请填写，作废原因！");
+        List<Standard> standards = super.list(Condition.create().in("id",ids).eq("effective",1));
+        if (CollectionUtils.isNotEmpty(standards)){
+            for (Standard standard : standards) {
+                RestAssert.fail("检测标准："+standard.getCode()+"已经作废，请勿重复作废！");
+            }
+        }
+        Standard gradingStandard = new Standard();
+        gradingStandard.setAbolisher(account.getUserName());
+        gradingStandard.setAbolisherId(account.getUserId());
+        gradingStandard.setAbolishTime(new Date());
+        gradingStandard.setAbolishReason(reason);
+        gradingStandard.setEffective(1);
+        return super.update(gradingStandard,Condition.create().in("id",ids));
+    }
 }

src/test/java/resources/db_sql/hmhj/v113/20210628产品标准新增作废信息.sql

+ALTER TABLE "public"."standard"
+ALTER TABLE "public"."standard"
+  ADD COLUMN "effective" int2 DEFAULT 0,
+  ADD COLUMN "abolisher" varchar(150) COLLATE "pg_catalog"."default",
+  ADD COLUMN "abolisher_id" int8,
+  ADD COLUMN "abolish_time" timestamp(6),
+  ADD COLUMN "abolish_reason" varchar(255) COLLATE "pg_catalog"."default";
+
+COMMENT ON COLUMN "public"."standard"."effective" IS '是否有效(0有效1无效)';
+
+COMMENT ON COLUMN "public"."standard"."abolisher" IS '作废人';
+
+COMMENT ON COLUMN "public"."standard"."abolisher_id" IS '作废人ID';
+
+COMMENT ON COLUMN "public"."standard"."abolish_time" IS '作废时间';
+
+COMMENT ON COLUMN "public"."standard"."abolish_reason" IS '作废原因';
\ No newline at end of file