修改ugp问题

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/Task.java

@@ -37,7 +37,7 @@ public class Task extends BaseEntity {
     private Long sourceId;
 
     @ApiModelProperty(value = "任务状态（0：未开始 1：进行中 2：已结束）")
-    private Boolean status;
+    private int status;
 
     @ApiModelProperty(value = "任务开始时间")
     private String statusLabel;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/mapper/TaskMapper.java

@@ -14,6 +14,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaskMapper extends BaseMapper<Task> {
 
-    IPage getTask(IPage page,int type,Long unitId);
+    IPage getTask(IPage page,Integer type,Long unitId);
 
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/TaskMapper.xml

@@ -7,16 +7,16 @@
 
 
     <select id="getTask" resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Task">
-       select  tk.* ,tp.`url` as extend
-       from  tz_ugp_task tk ,
-       tz_ugp_path tp
-       where  tk.title =tp.`name` and
-        tk.`status` =tp.`status`
-        and tk.unit_id =#{unitId}
+        SELECT
+        tk.*,
+        tp.`url` AS extend
+        FROM
+        tz_ugp_task tk
+        LEFT JOIN
+        tz_ugp_path tp ON tk.title = tp.`name` and  tk.`status` = tp.`status`
+       where tk.unit_id =#{unitId}
         <if test="type != null ">
             and tk.status =#{type}
         </if>
-
-
     </select>
 </mapper>
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/MaterialController.java

@@ -3,8 +3,10 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.ugp.api.dto.MaterialCount;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Material;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
@@ -128,16 +130,15 @@ public class MaterialController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "材料信息表分页查询",  notes = "材料信息表分页查询")
-	@BusinessIdentify
-	public ResponseModel<Page<MaterialDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+
+	public ResponseModel<IPage<Material>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size,
 					@RequestParam(value = "name",required = false) String name,
 					@RequestParam(value = "code",required = false) String code) {
-	    Page<MaterialDto> page = new Page<MaterialDto>();
+	    IPage<Material> page = new Page<>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-		Long companyId = orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr();
-	    return ResponseHelper.buildResponse(materialServiceImpl.queryForMaterialPage(page,name,code,companyId));
+	    return ResponseHelper.buildResponse(materialServiceImpl.queryForMaterialPage(page,name,code));
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -262,7 +262,7 @@ public class ProjectController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "查询下拉选择框的值", notes = "查询下拉选择框的值")
 	@GetMapping(value = "/getCharge")
-	public ResponseModel<List<OrgUsr>> getCharge(Long sequenceNbr){
+	public ResponseModel<List<OrgUsr>> getCharge(@RequestParam(required = false) Long sequenceNbr){
 		return ResponseHelper.buildResponse(orgServiceImpl.getCharge(sequenceNbr));
 	}
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/MaterialServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
@@ -47,11 +48,59 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
     CompanyMapper companyMapper;
     @Autowired
     SuperviseRuleMapper superviseRuleMapper;
+
+    @Autowired
+    SuperviseRuleServiceImpl superviseRuleService;
+    @Autowired
+    CompanyServiceImpl companyService;
+
     /**
      * 分页查询
      */
-    public Page<MaterialDto> queryForMaterialPage(Page<MaterialDto> page,String name ,String code,Long companyId) {
-        return this.queryForPage(page, "rec_date", false,name,code,companyId);
+    @BusinessIdentify
+    public IPage<Material> queryForMaterialPage(IPage<Material> page, String name , String code) {
+
+        LambdaQueryWrapper<Material> wrapper = new LambdaQueryWrapper<>();
+        if(!ValidationUtil.isEmpty(name)){
+            wrapper.like(Material::getName,name);
+        }
+        if(!ValidationUtil.isEmpty(code)){
+            wrapper.like(Material::getCode,code);
+        }
+        wrapper.in(Material::getCompanyId,getCompanyIds());
+        return this.page(page,wrapper);
+    }
+
+    @BusinessIdentify
+    public Set<Long> getCompanyIds(){
+        List<String> regionCodeList = new ArrayList<>();
+        Set<Long> companyIds = new HashSet<>();
+        Long companyId = orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr();
+        companyIds.add(companyId);
+        String companyType = orgService.getReginParams().getBusinessInfo().getCompanyType();
+        if(OrgEnum.监察部门.getKey().equals(companyType) || OrgEnum.监检机构.getKey().equals(companyType)) {
+            LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
+            if (OrgEnum.监察部门.getKey().equals(companyType)) {
+                wrapper.eq(SuperviseRule::getSuperviseDeptId, companyId);
+            } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
+                wrapper.eq(SuperviseRule::getInspectionUnitId, companyId);
+            }
+            List<SuperviseRule> superviseRuleList = superviseRuleService.list(wrapper);
+            for (SuperviseRule superviseRule : superviseRuleList) {
+                regionCodeList.add(String.valueOf(superviseRule.getAdminRegionCode()));
+            }
+
+            LambdaQueryWrapper<Company> companyWrapper = new LambdaQueryWrapper<>();
+            companyWrapper.in(Company::getRegionCode, regionCodeList);
+
+            List<Company> companyList = companyService.list(companyWrapper);
+            for (Company company : companyList) {
+                companyIds.add(company.getSequenceNbr());
+            }
+        }
+
+        return companyIds;
+
     }
 
     /**
@@ -189,6 +238,8 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
     public List<MaterialCount> pipeManufacturerStatistics() {
         List<MaterialCount> materialCountList=null;
         Long companySequenceNbr = orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr();
+        ArrayList<Long> listIdList = Lists.newArrayList();
+        listIdList.add(companySequenceNbr);
         LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
         String type = companyMapper.selectById(companySequenceNbr).getType();
         if (!ValidationUtil.isEmpty(type)) {
@@ -199,12 +250,9 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
                     LambdaQueryWrapper<Company> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                     lambdaQueryWrapper.eq(Company::getRegionCode,i.getAdminRegionCode());
                     List<Company> companies = companyMapper.selectList(lambdaQueryWrapper);
-                    ArrayList<Long> listIdList = Lists.newArrayList();
                     for (Company company : companies) {
                         listIdList.add(company.getSequenceNbr());
                     }
-                    materialCountList =materialMapper.getConditionCount(listIdList);
-
                 }
 
             }else if (type.contains(OrgEnum.监察部门.getKey())) {
@@ -214,17 +262,12 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
                     LambdaQueryWrapper<Company> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                     lambdaQueryWrapper.eq(Company::getRegionCode,i.getAdminRegionCode());
                     List<Company> companies = companyMapper.selectList(lambdaQueryWrapper);
-                    ArrayList<Long> listIdList = Lists.newArrayList();
                     for (Company company : companies) {
                         listIdList.add(company.getSequenceNbr());
                     }
-                    materialCountList =materialMapper.getConditionCount(listIdList);
-
                 }
-            } else if (type.contains(OrgEnum.安装单位.getKey())) {
-            materialCountList = materialMapper.getMaterialCount( );
-
             }
+            materialCountList =materialMapper.getConditionCount(listIdList);
         }
 
         return materialCountList;

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -59,6 +59,9 @@ public class OrgServiceImpl {
     @Autowired
     private RedisUtils redisUtils;
 
+    @Autowired
+    MaterialServiceImpl materialServiceImpl;
+
     /**
      * 保存或更新orgUsr信息和FormInstance实体信息
      * sequenceNbr表示 若是更新动态表单，则传orgUsr表的sequenceNbr，
@@ -343,9 +346,13 @@ public class OrgServiceImpl {
      * @return
      */
     public IPage getCompanyWelder(IPage page){
-        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
-        return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()),page);
+        Set<Long> companyIds = materialServiceImpl.getCompanyIds();
+        List list = new ArrayList<>();
+        for (Long companyId : companyIds) {
+            list.addAll(getInfo(String.valueOf(companyId),page).getRecords());
+        }
+        page.setRecords(list);
+        return page;
     }
 
     /**
@@ -435,7 +442,7 @@ public class OrgServiceImpl {
         List<OrgUsr> orgUsrs = new ArrayList<>();
         LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>();
         //获取单位下人员
-        personWrapper.eq(OrgUsr::getParentId, String.valueOf(getReginParams().getBusinessInfo().getCompanySequenceNbr()))
+        personWrapper.like(OrgUsr::getBizOrgCode, getOrgUsr().getBizOrgCode())
                 .eq(OrgUsr::getBizOrgType, OrgEnum.普通人员.getKey());
         orgUsrs.addAll(orgUsrServiceImpl.list(personWrapper));
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProblemInitiationServiceImpl.java

@@ -156,6 +156,7 @@ public class ProblemInitiationServiceImpl {
             QualityProblem quality = qualityProblemService.getById(objectd.getSequenceNbr());
             objectd.setStatus(quality.getStatus());
 
+            unitIds = new ArrayList<>();
             taskType = getUnitId(unitIds, objectd);
             taskService.saveOrUpdateTask(objectd.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.质量问题.getKey(), unitIds);
         }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java

@@ -8,6 +8,7 @@ import com.mao.expertSystem.WeldingQualification;
 import com.mao.expertSystem.material.MyPqr;
 import com.mao.expertSystem.material.MyWps;
 import com.yeejoin.amos.boot.biz.common.service.impl.WorkflowExcuteServiceImpl;
+import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.AuditEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
@@ -22,14 +23,20 @@ import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
 import com.yeejoin.amos.feign.workflow.model.AjaxResult;
 import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
+import org.apache.ibatis.type.LocalDateTypeHandler;
+import org.joda.time.LocalDateTime;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
+import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.*;
 
 @Service
@@ -81,7 +88,9 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
             dto.setProcessDefinitionKey(processDefinitionKey);
             dto.setBusinessKey("1");
+//            System.out.println("执行前"+ DateUtils.date2LongStr(new Date()));
             AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
+//            System.out.println("执行后"+DateUtils.date2LongStr(new Date()));
             instanceId = ((Map)ajaxResult.get("data")).get("id").toString();
             ProjectInitiation projectInitiation = new ProjectInitiation();
             projectInitiation.setInstanceId(instanceId);
@@ -174,8 +183,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         } finally {
             //更新任务表的状态 已办
             taskType = getUnitId(unitIds, project, superviseRule);
-            taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds);
-
+            taskService.saveOrUpdateTask(project.getStatus(), true, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds);
 
             //更新project种的status字段，表示当前流程下一个执行的任务
             updateProjectFlowStatus(instanceId);
@@ -185,8 +193,9 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             if(ValidationUtil.isEmpty(project)){
                 project = projectService.getById(object.getLong("projectId"));
             }
+            unitIds = new ArrayList<>();
             taskType = getUnitId(unitIds, project, superviseRule);
-            taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), object.getLong("sequenceNbr"), TaskTypeEnum.项目立项.getKey(), unitIds);
+            taskService.saveOrUpdateTask(project.getStatus(), false, taskType, new Date(), project.getSequenceNbr(), TaskTypeEnum.项目立项.getKey(), unitIds);
         }
     }
 
@@ -204,11 +213,13 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             unitIds.add(project.getInstallationUnitId());
             taskType = TaskTypeEnum.填报.getKey();
         }
-        if (ProjectInitiationEnum.接受告知.getName().equals(project.getStatus())) {
+        if (ProjectInitiationEnum.接受告知.getName().equals(project.getStatus()) || ProjectInitiationEnum.平台审核.getName().equals(project.getStatus())) {
             unitIds.add(superviseRule.getSuperviseDeptId());
+            taskType = TaskTypeEnum.流程.getKey();
         }
         if (ProjectInitiationEnum.审查项目.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员分配.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检员审核.getName().equals(project.getStatus()) || ProjectInitiationEnum.监检科室分配.getName().equals(project.getStatus())) {
             unitIds.add(superviseRule.getInspectionUnitId());
+            taskType = TaskTypeEnum.流程.getKey();
         }
         if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus()) ) {
             unitIds.add(project.getInstallationUnitId());

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/TaskServiceImpl.java

@@ -86,9 +86,16 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
                     task.setTaskTypeLabel(TaskTypeEnum.企业审核.getName());
                 }
 
+                int state;
+                if(status){
+                    state = 1;
+                } else {
+                    state = 0;
+                }
+
                 task.setUnitId(unitId);
                 task.setTitle(title);
-                task.setStatus(status);
+                task.setStatus(state);
                 task.setSendTime(sendTime);
                 task.setSourceId(sourceId);
                 task.setType(type);
@@ -97,8 +104,8 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
                     //更新任务表 已办
                     LambdaQueryWrapper<Task> wrapper = new LambdaQueryWrapper<>();
                     wrapper.eq(Task::getType, type)
-                            .eq(Task::getStatus, false)
-                            .eq(Task::getTitle, InitiationStatus)
+                            .eq(Task::getStatus, 0)
+                            .eq(Task::getTitle, title)
                             .eq(Task::getSourceId, sourceId)
                             .eq(Task::getUnitId, unitId);
                     List<Task> taskList = this.list(wrapper);
@@ -107,6 +114,7 @@ public class TaskServiceImpl extends BaseService<TaskDto, Task, TaskMapper> impl
                     }
                     task = taskList.iterator().next();
                     task.setStatusLabel(TaskTypeEnum.已办.getName());
+                    task.setStatus(state);
                     taskStatus = "已完成";
                 } else {
                     //添加任务表 待办

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectResourceEnum;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
@@ -51,6 +52,9 @@ public class WelderServiceImpl {
     @Autowired
     CompanyMapper companyMapper;
 
+    @Autowired
+    MaterialServiceImpl materialServiceImpl;
+
 
 
     /**
@@ -198,26 +202,8 @@ public class WelderServiceImpl {
     @BusinessIdentify
     public List<Map> welderStatistics() {
         Set<String> personCode = new HashSet<>();
-        Long companyIds = orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr();
-        String bizOrgCode = orgUsrService.getById(companyIds).getBizOrgCode();
-
-        String companyKey = companyMapper.selectById(companyIds).getType();
-        if(companyKey.equals(OrgEnum.安装单位.getKey())){
-            personCode.add(String.valueOf(bizOrgCode));
-        } else if (companyKey.equals(OrgEnum.监检机构.getKey())) {
-            LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(OrgUsr::getBizOrgCode,orgUsrService.getById(companyIds).getBizOrgCode());
-            List<OrgUsr> selectCodes = orgUsrService.list(wrapper);
-            for(OrgUsr selectCode : selectCodes){
-                personCode.add(String.valueOf(selectCode.getBizOrgCode()));
-            }
-        } else if (companyKey.equals(OrgEnum.监察部门.getKey())) {
-            LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(OrgUsr::getSequenceNbr,orgUsrService.getById(companyIds).getParentId());
-            List<OrgUsr> selectCodes = orgUsrService.list(wrapper);
-            for(OrgUsr selectCode : selectCodes){
-                personCode.add(String.valueOf(selectCode.getBizOrgCode()));
-            }
+        for(Long companyId: materialServiceImpl.getCompanyIds()){
+            personCode.add(orgService.getOrgUsrById(String.valueOf(companyId)).getBizOrgCode());
         }
         return welderMapper.welderStatistics(personCode);
     }