王刚对完的优化建议修改

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

@@ -38,9 +38,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);
         }
@@ -52,9 +52,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/entity/PlanTraining.java

@@ -60,6 +60,9 @@ public class PlanTraining implements Serializable {
 //	@ApiModelProperty("联系电话")
 //	private String phone;
 
+	@ApiModelProperty("培训时间（上半年，下半年）")
+	private String trainingTime;
+
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/query/PlanTrainingQuery.java

@@ -45,6 +45,9 @@ public class PlanTrainingQuery {
 //	@ApiModelProperty("联系电话")
 //	private String phone;
 
+	@ApiModelProperty("培训时间（上半年，下半年）")
+	private String trainingTime;
+
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/PlanTrainingVo.java

@@ -43,6 +43,9 @@ public class PlanTrainingVo {
 //	@ApiModelProperty("联系电话")
 //	private String phone;
 
+	@ApiModelProperty("培训时间（上半年，下半年）")
+	private String trainingTime;
+
 	@ApiModelProperty("开始时间")
 	private LocalDate startTime;
 

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

@@ -309,6 +309,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
                     }
                     //选择比表面积必须选择密度
                     if(teamNameList.contains("比表面积")){
+                        QueryWrapper<Team> teamQW = new QueryWrapper<>();
+                        teamQW.eq("name", "密度");
+                        Team teamMD = teamMapper.selectOne(teamQW);
+                        if(teamMD == null){
+                            return BaseResponse.errorMsg("请联系管理员配置密度检测项");
+                        }
                         if(!teamNameList.contains("密度")){
                             return BaseResponse.errorMsg("选择比表面积必须选择密度");
                         }

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

@@ -284,11 +284,11 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
 
 
 	/**
-	 * 判断设备检定是否到期，如果到期，提醒检定人员 每天早上6点
+	 * 判断设备检定是否到期，如果到期，提醒检定人员 每周一早上6点
 	 * @return
 	 */
 	@Override
-	@Scheduled(cron = "0 0 6 * * *")
+	@Scheduled(cron = "0 0 6 * * MON")
 	public BaseResponse<String> checktestDate(){
 		//消息推送
 		List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("设备检定");

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

@@ -257,7 +257,7 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
 	 * @return
 	 */
 	@Override
-	@Scheduled(cron = "0 0 6 * * *")
+//	@Scheduled(cron = "0 0 6 * * *")
 //	@Scheduled(cron = "0 * * * * ?")
 	public BaseResponse<String> checkplanDate() {
 		QueryWrapper<PlanTraining> qw = new QueryWrapper<>();

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