委托任务接收按钮去掉

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

@@ -36,9 +36,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);
         }
@@ -50,9 +50,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/impl/EntrustServiceImpl.java

@@ -934,8 +934,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 				                        .setUserId(handleVo.getUserId())
 				                        .setHandleId(handleVo.getId())
 				                        .setPlanFinishDate(null)    //样品处理要求完成放到了委托表，评审的时候直接设定
-				                        .setStatus(0)
-				                        .setCreateTime(LocalDateTime.now());
+//				                        .setStatus(0)
+				                        .setCreateTime(LocalDateTime.now())
+                                        .setStatus(1)  //直接默认接收
+                                        .setAcceptTime(LocalDateTime.now());
 		                        sampleHandleMapper.insert(sampleHandle);
 		                        if(sampleHandle.getHandleId() != null){
 			                        Handle handle = handleMapper.selectById(sampleHandle.getHandleId());
@@ -1454,8 +1456,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                                 .setTeamGroupId(distributionTeamQuery.getTeamGroupId())
                                 .setTeamId(distributionTeamQuery.getTeamId())
                                 .setUserId(distributionTeamQuery.getUserId())
-                                .setStatus(0)
-                                .setCreateTime(LocalDateTime.now());
+//                                .setStatus(0)
+                                .setCreateTime(LocalDateTime.now())
+                                .setStatus(1)  //直接接收检测任务
+                                .setAcceptTime(LocalDateTime.now());
                         sampleDistributionList.add(sampleDistribution);
 
                         //获取产值信息

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

@@ -7,8 +7,8 @@ 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://47.93.148.213: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://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
@@ -45,7 +45,7 @@ weixin:
   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>,
+  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>,
 
 
 

config/application.yml

 server:
-  port: 7006
-basename: sinoma_tcdri
+  port: 7012
+basename: sinoma_bangye
 spring:
   application: tianjin
   profiles:
 #    启动命令加上   -Dspring.config.location={文件路径}\config\application.yml
+#    -Dspring.config.location=D:\idea_workspases\tianjin-cement\config\application.yml
     path: /opt/cement/config/tianjin/
     active: dev
   datasource:
@@ -40,12 +41,24 @@ mybatis-plus:
   type-aliases-package: cn.wise.sc.cement.business.entity.**
   mapper-locations: classpath:/cn/wise/sc/cement/business/mapper/xml/*Mapper.xml
 
+#天津
+#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>,
-
+  agentId: 1000004
+  agentIdPC: 1000005
+  agentSecret: flISLojPiE1_ieO9bPgyZ4g_4O-Rr-FKzs7e7p3HEtA
+  agentSecretPC: ABagJNftdn1uOYsDLrhlCIM8jZdcTgEA9DyX6kn_-hY
+  backUrl: https%3a%2f%2flab.wisenergy.cn%2flab-bangye
+  systemUrl: <a href=\"https://open.weixin.qq.com/connect/oauth2/authorize?appid="ww348f91b2573c1867"&redirect_uri="https%3a%2f%2flab.wisenergy.cn%2flab-bangye"%2f&response_type=code&scope=snsapi_base&state=#wechat_redirect\">物化检测流程</a>,