bug修改

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanController.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -146,6 +147,7 @@ public class PlanController extends AbstractBaseController {
     @RequestMapping(value = "/addPlan", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     public CommonResponse checkPlanAdd(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan param) {
         try {
+            String userId = RequestContext.getExeUserId();
             if (param.getDayRate() == 1) {
                 long dayBeginTime = param.getDayBegin().getTime();
                 long dayEndTime = param.getDayEnd().getTime();
@@ -159,25 +161,25 @@ public class PlanController extends AbstractBaseController {
             HashMap<String, Object> map = new HashMap<>();
             map.put("org_code", loginOrgCode);
 
-            List<String> userGroupIds = Objects.nonNull(param.getUserGroupId()) ? Arrays.asList(param.getUserGroupId().split(",")) : Collections.emptyList();
-            StringBuilder userIdSB = new StringBuilder(), userDeptSB = new StringBuilder(), userNameSB = new StringBuilder();
-            ResponseModel<List<UserDetailsDto>> response;
-            for (String userGroupId : userGroupIds) {
-                response = tzsFeign.getGroupAndPersonInfo(Long.valueOf(userGroupId));
-                if (response.getStatus() == 200) {
-                    List<UserDetailsDto> resultList = response.getResult();
-                    for (UserDetailsDto udd : resultList) {
-                        userIdSB.append(",").append(udd.getUserId());
-                        userDeptSB.append(",").append(udd.getUserId()).append("@").append(udd.getUnitOrgCode()).append("@").append(udd.getUnitName());
-                        userNameSB.append(",").append(udd.getUserName());
-                    }
-                }
-            }
-            String userId = StringUtils.hasText(userIdSB) ? userIdSB.substring(1) :  "";
-            String userDept = StringUtils.hasText(userDeptSB) ? userDeptSB.substring(1) :  "";
-            String userName = StringUtils.hasText(userNameSB) ? userNameSB.substring(1) :  "";
-            param.setUserId(userId);
-            param.setUserDept(userDept);
+//            List<String> userGroupIds = Objects.nonNull(param.getUserGroupId()) ? Arrays.asList(param.getUserGroupId().split(",")) : Collections.emptyList();
+//            StringBuilder userIdSB = new StringBuilder(), userDeptSB = new StringBuilder(), userNameSB = new StringBuilder();
+//            ResponseModel<List<UserDetailsDto>> response;
+//            for (String userGroupId : userGroupIds) {
+//                response = tzsFeign.getGroupAndPersonInfo(Long.valueOf(userGroupId));
+//                if (response.getStatus() == 200) {
+//                    List<UserDetailsDto> resultList = response.getResult();
+//                    for (UserDetailsDto udd : resultList) {
+//                        userIdSB.append(",").append(udd.getUserId());
+//                        userDeptSB.append(",").append(udd.getUserId()).append("@").append(udd.getUnitOrgCode()).append("@").append(udd.getUnitName());
+//                        userNameSB.append(",").append(udd.getUserName());
+//                    }
+//                }
+//            }
+//            String userId = StringUtils.hasText(userIdSB) ? userIdSB.substring(1) :  "";
+//            String userDept = StringUtils.hasText(userDeptSB) ? userDeptSB.substring(1) :  "";
+//            String userName = StringUtils.hasText(userNameSB) ? userNameSB.substring(1) :  "";
+//            param.setUserId(userId);
+//            param.setUserDept(userDept);
 
             param.setBizOrgCode(loginOrgCode);
             param.setBizOrgName(getCompanyName(reginParams));

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanServiceImpl.java

@@ -53,9 +53,9 @@ public class PlanServiceImpl implements IPlanService {
 		String org_code = map.get("org_code") == null ? "":map.get("org_code").toString();
 		String user_id = map.get("user_id")== null ? "":map.get("user_id").toString();
 
-		if(StringUtil.isNotEmpty(map.get("dept_id"))){
-			param.setDeptId(map.get("dept_id").toString());
-		}
+//		if(StringUtil.isNotEmpty(map.get("dept_id"))){
+//			param.setDeptId(map.get("dept_id").toString());
+//		}
 		param.setOrgCode(org_code);
 		param.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_START));
 		param.setNextGenDate(DateUtil.getIntervalDate(new Date(),0));

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -717,8 +717,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             paramMap.put("id", plan.getId());
             paramMap.put("next_gen_date", DateUtil.formatDatrToStr(now, "yyyy-MM-dd"));
             planMapper.updPlanStatusOrGenDate(paramMap);// 更新下次任务生成日期
-        }
-//        Toke toke = remoteSecurityService.getServerToken();
+        } else {
             Map<String, String> deptMap = new HashMap<>();
             try {
                 String isFixDate = plan.getIsFixedDate();// 是否固定日期
@@ -866,7 +865,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
                 e.printStackTrace();
                 log.error(e.getMessage());
                 throw new  RuntimeException(e.getMessage());
-
+            }
         }
     }
 
@@ -1168,6 +1167,8 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         List<PlanTaskDetail> planTaskDetails = iPlanTaskDetailDao.findAllByTaskNoAndStatus(planTask.getId(), PlanTaskDetailStatusEnum.NOTSTARTED.getValue());
         if (!planTaskDetails.isEmpty()) {
             planTaskDetails.stream().forEach(action -> {
+                action.setStatus(PlanTaskDetailStatusEnum.QUALIFIED.getValue());
+                iPlanTaskDetailDao.saveAndFlush(action);
                 planTaskDetailMapper.finishTaskDetail(action.getId(), action.getPointId(),
                         action.getPlanTask().getId(), userId);
             });

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

 package com.yeejoin.amos.patrol.quartz;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
@@ -18,6 +19,7 @@ import com.yeejoin.amos.patrol.business.dao.mapper.PlanTaskMapper;
 import com.yeejoin.amos.patrol.business.dao.repository.*;
 import com.yeejoin.amos.patrol.business.entity.mybatis.PlanTaskPointInputItemBo;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
+import com.yeejoin.amos.patrol.business.param.CheckInputParam;
 import com.yeejoin.amos.patrol.business.param.MsgConfigParam;
 import com.yeejoin.amos.patrol.business.service.intfc.IMessageService;
 import com.yeejoin.amos.patrol.business.service.intfc.IPatrolDataSyncService;
@@ -104,6 +106,9 @@ public class JobService implements IJobService {
     @Autowired
     private WebMqttComponent webMqttComponent;
 
+    @Autowired
+    IInputItemDao inputItemDao;
+
 
     @Autowired
     JcsFeignClient jcsFeignClient;
@@ -417,7 +422,11 @@ public class JobService implements IJobService {
                 check = checkMap.get(arg.getPointId());
             }
             if (arg.getInputItemId() != null) {
+
+                InputItem inputItem = inputItemDao.findById(arg.getInputItemId()).get();
                 CheckInput checkInput = new CheckInput();
+                checkInput = paraseSelect(checkInput, inputItem.getDataJson(),  inputItem.getIsScore());
+
                 checkInput.setCheckId(check.getId());
                 checkInput.setInputId(arg.getInputItemId());
                 checkInput.setIsOk(CheckStatusEnum.QUALIFIED.getCode());
@@ -436,6 +445,21 @@ public class JobService implements IJobService {
 
     }
 
+    private CheckInput paraseSelect(CheckInput checkInput, String json,  String isScore) {
+        JSONArray jsonArray = JSONArray.parseArray(json);
+        if (!ObjectUtils.isEmpty(jsonArray)) {
+            for (int i = 0; i < jsonArray.size(); i++) {
+                JSONObject jsonObject = jsonArray.getJSONObject(i);
+                String validateName = jsonObject.getString("name");
+                String validateIsOk = jsonObject.getString("isOk");
+                if(validateIsOk.equals("是")) {
+                    checkInput.setInputValue(validateName);
+                }
+            }
+        }
+        return checkInput;
+    }
+
     private void removeJob(String jobName) {
         log.debug("removeJob==jobName==" + jobName);
         QuartzManager.removeJob(jobName);

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -413,26 +413,13 @@
 
 	<select id="getPlanTaskPoints" resultType="Map">
 		SELECT
-			p.name,
-			p.id pointId,
-			p.point_no pointNO,
-			p.offline,
 			ptd.status,
-			ptd.is_finish finish,
-			p.is_fixed isFixed,
-			pt.route_id routeId,
-			c.id checkId,
-			prp.order_no orderNo
+			P.NAME,
+			P.ID pointId
 		FROM
-			p_plan_task_detail ptd
-		LEFT JOIN p_plan_task pt  ON pt.id = ptd.task_no
-		LEFT JOIN p_point p ON p.id = ptd.point_id
-		LEFT JOIN p_check c ON c.plan_task_detail_id = ptd.id
-		LEFT JOIN p_route_point prp ON prp.point_id = ptd.point_id AND prp.route_id = pt.route_id
-		WHERE
-			p.is_delete = 0
-		<if test="planTaskId != null and planTaskId > 0  ">and pt.id = #{planTaskId}</if>
-		ORDER BY orderNo
+			( SELECT * FROM p_plan_task_detail ptd WHERE ptd.task_no = #{planTaskId} ) ptd
+				LEFT JOIN (SELECT * from p_point where is_delete = 0)  P ON P.ID = ptd.point_id
+
 	</select>
 
 	<select id="getCurrentPlanTaskCount" resultType="int" parameterType="long">