修改任务

amos-boot-module/amos-boot-module-api/amos-boot-module-patrol-api/src/main/java/com/yeejoin/amos/patrol/dao/entity/Plan.java

@@ -245,6 +245,31 @@ public class Plan extends BasicEntity {
 	@Column(name="user_dept")
 	private String userDept;
 
+
+	//单位code
+	@Column(name = "biz_org_code")
+	private String bizOrgCode;
+	//单位名称
+	@Column(name = "biz_org_name")
+	private String bizOrgName;
+
+
+	public String getBizOrgCode() {
+		return bizOrgCode;
+	}
+
+	public void setBizOrgCode(String bizOrgCode) {
+		this.bizOrgCode = bizOrgCode;
+	}
+
+	public String getBizOrgName() {
+		return bizOrgName;
+	}
+
+	public void setBizOrgName(String bizOrgName) {
+		this.bizOrgName = bizOrgName;
+	}
+
 	public String getUserDept() {
 		return userDept;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
 
+import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -986,4 +987,32 @@ public class OrgUsrController extends BaseController {
 
 		return ResponseHelper.buildResponse(iOrgUsrService.getDetByCompanyId(parentId.getResult()));
 	}
+
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST", value = "查询单位基本信息", notes = "查询单位基本信息")
+	@GetMapping(value = "/selectByIdDeptList")
+	public ResponseModel<Object> selectByIdDeptList(@RequestBody String ids) throws Exception {
+
+		String[] slid  =  ids.split(",");
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.in(OrgUsr::getSequenceNbr, Arrays.asList(slid));
+		List<OrgUsr> orgUsrList =orgUsrMapper.selectList(wrapper);
+		return ResponseHelper.buildResponse(orgUsrList);
+	}
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "POST", value = "查询单位基本信息", notes = "查询单位基本信息")
+	@GetMapping(value = "/selectByAmosOrgIdDeptList")
+	public ResponseModel<Object> selectByAmosOrgIdDeptList(@RequestBody String ids) throws Exception {
+
+		String[] slid  =  ids.split(",");
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.in(OrgUsr::getAmosOrgId, Arrays.asList(slid));
+		List<OrgUsr> orgUsrList =orgUsrMapper.selectList(wrapper);
+		return ResponseHelper.buildResponse(orgUsrList);
+	}
+
+
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -88,6 +88,51 @@ public class PlanTaskController extends AbstractBaseController {
 
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "计划执行重做", notes = "计划执行重做")
+    @RequestMapping(value = "/regenPlanTaskNew", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    public CommonResponse planTaskReGenNew(
+            @ApiParam(value = "巡检计划", required = true) @RequestBody HashMap<String, Object> param) {
+        if (param.get("planId") == null) {
+            throw new YeeException("计划编号不能为空");
+        }
+        if (param.get("beginDate") == null) {
+            throw new YeeException("开始日期能为空");
+        }
+        if (param.get("endDate") == null) {
+            throw new YeeException("结束日期不能为空");
+        }
+        if (param.get("changeFlag") == null) {
+            throw new YeeException("是否记为合格不能为空");
+        }
+        try {
+            planTaskService.reGenPlanTaskNew(param);
+            return CommonResponseUtil.success();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            return CommonResponseUtil.failure("计划执行重做失败");
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     /**
      * 计划执行删除
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java

@@ -65,5 +65,11 @@ public interface JcsFeignClient {
     @GetMapping(value = "/org-usr/getCompanyInfo")
      ResponseModel<Object> getCompanyInfo(@RequestParam(value = "companyId") String companyId);
 
+
+    @PostMapping (value = "/org-usr/selectByIdDeptList")
+    FeignClientResult<List<Map<String, Object>>> selectByIdDeptList(@RequestBody String ids);
+    @PostMapping (value = "/org-usr/selectByAmosOrgIdDeptList")
+    FeignClientResult<List<Map<String, Object>>> selectByAmosOrgIdDeptList(@RequestBody String ids);
+
 }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/intfc/IPlanTaskService.java

@@ -40,6 +40,11 @@ public interface IPlanTaskService {
 	void reGenPlanTask(HashMap<String, Object> param) throws ParseException;
 
 	/**
+	 * 计划执行重做
+	 */
+	void reGenPlanTaskNew(HashMap<String, Object> param) throws ParseException;
+
+	/**
 	 * 计划执行删除
 	 */
 	void planTaskDet(String[] strArry);