评审时 增加样品删除功能

cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java

 package cn.wise.sc.cement.business.controller;
 
+import cn.wise.sc.cement.business.entity.SysUser;
 import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.enumation.FileExt;
 import cn.wise.sc.cement.business.model.PageQuery;
@@ -9,6 +10,7 @@ import cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo;
 import cn.wise.sc.cement.business.model.vo.SampleVo;
 import cn.wise.sc.cement.business.service.IEntrustService;
 import cn.wise.sc.cement.business.util.WordUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -103,6 +105,17 @@ public class EntrustController {
 		return BaseResponse.errorMsg("失败!");
 	}
 
+	@ApiOperation(value = "评审时删除委托样品")
+	@PostMapping("/deleteSample/{sampleId}")
+	public BaseResponse deleteSample(@PathVariable Integer sampleId) {
+		try {
+			return entrustService.deleteSample(sampleId);
+		} catch (Exception e) {
+			log.debug("评审时删除委托样品{}", e);
+		}
+		return BaseResponse.errorMsg("失败!");
+	}
+
 	@ApiOperation(value = "委托详情")
 	@GetMapping("/{id}")
 	public BaseResponse getDtail(@PathVariable Integer id) {

cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java

@@ -40,9 +40,9 @@ public class WeiXinController {
         log.debug("=============================================");
         try {
             //测试服务器
-//            return weiXinService.getTestToken(code);
+            return weiXinService.getTestToken(code);
             //正式服务器
-            return weiXinService.getToken(code, "APP");
+//            return weiXinService.getToken(code, "APP");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }
@@ -54,9 +54,9 @@ public class WeiXinController {
     public BaseResponse getPCToken(String code) {
         try {
             //测试服务器
-//            return weiXinService.getTestToken(code);
+            return weiXinService.getTestToken(code);
             //正式服务器
-            return weiXinService.getToken(code, "PC");
+//            return weiXinService.getToken(code, "PC");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }

cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java

@@ -35,6 +35,8 @@ public interface IEntrustService extends IService<Entrust> {
 
 	BaseResponse<Entrust> create(EntrustQuery query);
 
+	BaseResponse<String> deleteSample(Integer sampleId);
+
 	BaseResponse<EntrustVo> getDtail(Integer id);
 
 	BaseResponse<EntrustVo> getDetailCapacity(Integer id);

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -363,6 +363,48 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         return BaseResponse.okData(entrust);
     }
 
+    /**
+     * 删除委托样品
+     * @param sampleId
+     * @return
+     */
+    @Override
+    public BaseResponse<String> deleteSample(Integer sampleId) {
+        LoginUser loginUser = userService.getLoginUser();
+        if (loginUser == null) {
+            return BaseResponse.errorMsg("请登录账号");
+        }
+        List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
+        if (approvalIdList == null) {
+            return BaseResponse.errorMsg("委托评审信息错误");
+        }
+        if (!approvalIdList.contains(loginUser.getId())) {
+            return BaseResponse.errorMsg("权限不足");
+        }
+        if (sampleId == null) {
+            return BaseResponse.errorMsg("参数错误");
+        }
+        SampleTmp sampleTmp = sampleTmpService.getById(sampleId);
+        if (sampleTmp == null || sampleTmp.getEntrustId() == null) {
+            return BaseResponse.errorMsg("信息错误");
+        }
+        Entrust entrust = entrustMapper.selectById(sampleTmp.getEntrustId());
+        if (entrust == null ) {
+            return BaseResponse.errorMsg("委托信息错误");
+        }
+        if(entrust.getStatus() != 0){
+            return BaseResponse.errorMsg("状态不允许删除");
+        }
+        QueryWrapper<SampleTmp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("entrust_id", sampleTmp.getEntrustId());
+        Integer conunts = sampleTmpService.count(queryWrapper);
+        if (conunts < 2) {
+            return BaseResponse.errorMsg("至少保留一个样品信息");
+        }
+        sampleTmpService.removeById(sampleId);
+        return BaseResponse.okData("删除成功");
+    }
+
     /**
      * 委托详情
      *
@@ -905,6 +947,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         return BaseResponse.okData(maxCementCode);
     }
 
+
     /**
      * 委托评审
      *

cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java

@@ -128,7 +128,7 @@ public class CheckCountUtil {
 					StringUtils.isNotBlank(resultMap.get("VCuSO<sub>4</sub>(II)"))
 					){
 				BigDecimal TAl2O3 = getBigDecimal(resultMap.get("TAl<sub>2</sub>O<sub>3</sub>").trim());
-				BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl<sub>2</sub>O3").trim());
+				BigDecimal VAl2O3 = getBigDecimal(resultMap.get("VAl<sub>2</sub>O<sub>3</sub>").trim());
 				BigDecimal K = getBigDecimal(resultMap.get("K").trim());
 				BigDecimal VCuSO4_I = getBigDecimal(resultMap.get("VCuSO<sub>4</sub>(I)").trim());
 				BigDecimal m = getBigDecimal(resultMap.get("样重m").trim());

cement-business/src/main/resources/application.yml

@@ -7,9 +7,9 @@ spring:
     active: dev
   datasource:
     # 192.168.110.85   admin!@#123
-#    url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
 #    url: jdbc:mysql://192.168.110.85:3306/sinoma_bangye?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+#    url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: admin!@#123
     driverClassName: com.mysql.cj.jdbc.Driver
@@ -40,25 +40,25 @@ mybatis-plus:
   mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
 
 #正式服务器
-weixin:
-  corpId: wwc7ae84e6af6ba921
-  agentIdPC: 1000151
-  agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
-  agentId: 1000150
-  agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
-  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
-  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
+#weixin:
+#  corpId: wwc7ae84e6af6ba921
+#  agentIdPC: 1000151
+#  agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
+#  agentId: 1000150
+#  agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
+#  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+#  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
 
 
 #测试服务器
-#weixin:
-#  corpId: ww348f91b2573c1867
-#  agentId: 1000002
-#  agentIdPC: 1000003
-#  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
-#  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
-#  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
-#  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
+weixin:
+  corpId: ww348f91b2573c1867
+  agentId: 1000002
+  agentIdPC: 1000003
+  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
+  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
+  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
 
 
 

cement-business/target/classes/application.yml

@@ -7,9 +7,9 @@ spring:
     active: dev
   datasource:
     # 192.168.110.85   admin!@#123
-#    url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
 #    url: jdbc:mysql://192.168.110.85:3306/sinoma_bangye?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+#    url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: admin!@#123
     driverClassName: com.mysql.cj.jdbc.Driver
@@ -40,25 +40,25 @@ mybatis-plus:
   mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
 
 #正式服务器
-weixin:
-  corpId: wwc7ae84e6af6ba921
-  agentIdPC: 1000151
-  agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
-  agentId: 1000150
-  agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
-  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
-  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
+#weixin:
+#  corpId: wwc7ae84e6af6ba921
+#  agentIdPC: 1000151
+#  agentSecretPC: h4K-GL1y7pCADFZQ7m1tO1GOSa3zU4kGEItFknvwOAg
+#  agentId: 1000150
+#  agentSecret: zWIO_kt36d1jta3R76s6WmKFdfs2TuJ1wTQu1IXO0Fc
+#  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+#  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=wwc7ae84e6af6ba921&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
 
 
 #测试服务器
-#weixin:
-#  corpId: ww348f91b2573c1867
-#  agentId: 1000002
-#  agentIdPC: 1000003
-#  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
-#  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
-#  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
-#  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'
+weixin:
+  corpId: ww348f91b2573c1867
+  agentId: 1000002
+  agentIdPC: 1000003
+  agentSecret: gFa_7XvXtCaoeAYERzjRwwz_OTJkJfgBb8weOKjmI3o
+  agentSecretPC: itCLYcwl9ggA9VfZam_iz96Ikp9StDFfVr4Adb0yY7A
+  backUrl: https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system
+  systemUrl: '<a href="https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww348f91b2573c1867&redirect_uri=https%3a%2f%2fccdcmtl.sinoma-tianjin.com%2flab-system%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect">物化检测流程</a>,'