Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * 质量问题表 Mapper 接口
@@ -17,7 +18,7 @@ import java.util.List;
 @Repository
 public interface QualityProblemMapper extends BaseMapper<QualityProblem> {
 
-    IPage<QualityProblemDto> getItems(IPage<QualityProblemDto> page,QualityProblemDto qualityProblemDto);
+    IPage<QualityProblemDto> getItems(IPage<QualityProblemDto> page, QualityProblemDto qualityProblemDto, Set<String> projectIds);
 
     QualityProblemDto getInfoBySequenceNbr(String sequenceNbr);
 

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

@@ -32,6 +32,12 @@
             <if test="qualityProblemDto.code != '' and qualityProblemDto.code != null">
                 and qi.`code` like concat("%",qualityProblemDto.code,"%")
             </if>
+            <if test="projectIds != null">
+                and qi.project_id in
+                <foreach collection="projectIds" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
 

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

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -113,4 +114,16 @@ public class AttachmentController extends BaseController {
 	public ResponseModel<List<AttachmentDto>> selectForList() {
 	    return ResponseHelper.buildResponse(attachmentServiceImpl.queryForAttachmentList());
 	}
+
+	/**
+	 *  根据当前登录人获取单位
+	 *
+	 */
+	@BusinessIdentify
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/unit")
+	@ApiOperation(httpMethod = "Get",value="单位选择查询",notes= "单位选择查询")
+	public ResponseModel<String> selectUnit(){
+		return ResponseHelper.buildResponse(attachmentServiceImpl.selectUnit());
+	}
 }

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

@@ -122,8 +122,6 @@ public class EquipmentController extends BaseController {
 			}
 		}
 		return ResponseHelper.buildResponse(equipmentServiceImpl.removeByIds(sequenceNbr));
-
-
     }
 
     /**

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.NoticeStatusEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProjectInitiationEnum;
+import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.dto.*;
 import com.yeejoin.amos.boot.module.ugp.api.entity.InstallNotice;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
@@ -294,7 +295,9 @@ public class InstallNoticeController extends BaseController {
 		InstallNotice installNotice = installNoticeServiceImpl.getById(sequenceNbr);
 		installNotice.setNoticeStatus(NoticeStatusEnum.已接收.getName());
 		Project project = projectServiceImpl.getById(installNotice.getProjectId());
-		projectInitiationServiceImpl.execute(project.getInstanceId(),installNotice,NoticeStatusEnum.已接收.getStatusId());
+		JSONObject json = JSON.parseObject(JSON.toJSONString(installNotice));
+		json.put(XJConstant.PROCESS_PROJECT_STATE,"告知待审核");
+		projectInitiationServiceImpl.execute(project.getInstanceId(),json,NoticeStatusEnum.已接收.getStatusId());
 		return ResponseHelper.buildResponse(installNoticeServiceImpl.updateById(installNotice));
 	}
 

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

@@ -3,6 +3,7 @@ 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.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 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;
@@ -89,10 +90,11 @@ public class MaterialController extends BaseController {
 	public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") List<Long> sequenceNbr) throws Exception {
 
 		LambdaQueryWrapper<ProjectResource> wrapper = new LambdaQueryWrapper<>();
-		for (Long i:sequenceNbr){
-		wrapper.eq(ProjectResource::getResourceId,i);
-			if (!projectResourceMapper.selectList(wrapper).isEmpty()){
-				throw  new Exception("无法删除，已绑定项目");
+		for (Long i : sequenceNbr) {
+			wrapper.eq(ProjectResource::getResourceId, i);
+			if (!projectResourceMapper.selectList(wrapper).isEmpty()) {
+
+				return CommonResponseUtil.failure("无法删除,管材：" + materialServiceImpl.getById(i).getName() + "已绑定项目");
 			}
 		}
 		return ResponseHelper.buildResponse(materialServiceImpl.removeByIds(sequenceNbr));

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectMaterialDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.alibaba.fastjson.JSONObject;
@@ -12,6 +13,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.ProjectResource;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.MaterialServiceImpl;
+import org.aspectj.bridge.Message;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -203,8 +205,10 @@ public class ProjectResourceController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "POST",value = "绑定项目所用到的设备管材",   notes = "绑定项目所用到的设备管材")
 	@PostMapping(value = "/saveId")
-	public ResponseModel<ProjectResource> saveId(@RequestBody JSONObject jsonObject) throws Exception {
+	public ResponseModel<ResponseModel> saveId(@RequestBody JSONObject jsonObject) throws Exception {
+
         return ResponseHelper.buildResponse(projectResourceServiceImpl.saveIds(jsonObject));
+
 	}
 
 

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

@@ -6,6 +6,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProblemInitiationServiceImpl;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -53,6 +54,9 @@ public class QualityProblemController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增质量问题表", notes = "新增质量问题表")
 	public ResponseModel<QualityProblemDto> save(@RequestBody QualityProblemDto model) {
 	    model = qualityProblemServiceImpl.createWithModel(model);
+		QualityProblem qualityProblem = new QualityProblem();
+		BeanUtils.copyProperties(model, qualityProblem);
+		problemInitiationService.start(qualityProblem);
 	    return ResponseHelper.buildResponse(model);
 	}
 

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

@@ -8,12 +8,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.dto.InstallNoticeDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 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.ProjectMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
@@ -176,9 +178,18 @@ public class WelderController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @DeleteMapping(value = "/deleteOneById/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr删除人员信息表", notes = "根据sequenceNbr删除人员信息表")
-    public ResponseModel<String> deleteOneById(@PathVariable String sequenceNbr) throws Exception {
+    public ResponseModel<String> deleteOneById(@PathVariable List<Long> sequenceNbr) throws Exception {
 //        Privilege.agencyUserClient.multDeleteUser(orgServiceImpl.getOrgUsrById(sequenceNbr).getAmosOrgId());
-        orgServiceImpl.delectInfo(sequenceNbr);
+        LambdaQueryWrapper<ProjectResource> wrapper = new LambdaQueryWrapper<>();
+        for (Long i : sequenceNbr) {
+            wrapper.eq(ProjectResource::getResourceId, i);
+            if (!projectResourceMapper.selectList(wrapper).isEmpty()) {
+
+                return CommonResponseUtil.failure("无法删除,管材：" + orgServiceImpl.getdetialInfo(String.valueOf(i)).get("name") + "已绑定项目");
+            }
+            orgServiceImpl.delectInfo(String.valueOf(i));
+
+        }
         return ResponseHelper.buildResponse("ok");
     }
 

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

@@ -3,15 +3,23 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+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.entity.Attachment;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.AttachmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IAttachmentService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.AttachmentDto;
+import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
+import com.yeejoin.amos.boot.module.ugp.biz.controller.ProjectController;
+
 
 /**
  * 附件表服务实现类
@@ -21,6 +29,11 @@ import java.util.List;
  */
 @Service
 public class AttachmentServiceImpl extends BaseService<AttachmentDto,Attachment,AttachmentMapper> implements IAttachmentService {
+    @Autowired
+    OrgServiceImpl orgServiceImpl;
+
+    @Autowired
+    OrgUsrServiceImpl orgUsrService;
     /**
      * 分页查询
      */
@@ -61,4 +74,21 @@ public class AttachmentServiceImpl extends BaseService<AttachmentDto,Attachment,
         }
         this.save(attachment);
     }
+
+
+    /**
+     *获取登录人的单位
+     *
+     */
+    @BusinessIdentify
+    public String selectUnit(){
+        //获取登录人的redis信息
+        ReginParams reginParams = orgServiceImpl.getReginParams();
+        //根据redis信息去获取登录人信息后再获取到登录人的sequenceNbr
+        Long companyId = reginParams.getBusinessInfo().getCompanySequenceNbr();
+        OrgUsr orgUsr = orgUsrService.getById(companyId);
+        String key = orgUsr.getOrgExpandAttr1();
+        return OrgEnum.map.get(key);
+    }
+
 }
\ 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/service/impl/ProblemInitiationServiceImpl.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.workflow.feign.WorkflowFeignService;
 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.ProblemProcessEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.SMSEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
@@ -70,6 +71,12 @@ public class ProblemInitiationServiceImpl {
     @Value("${installationRoleId}")
     private String installationRoleId;
 
+    @Value("${monitoringRoleId}")
+    private String monitoringRoleId;
+
+    @Value("${constructionRoleId}")
+    private String constructionRoleId;
+
     public String start(QualityProblem qualityProblem) {
         String instanceId = null;
         //启动流程
@@ -119,7 +126,7 @@ public class ProblemInitiationServiceImpl {
 
         if (ProblemProcessEnum.重大问题整改完成发送短信.getName().equals(dataObject.getString("name"))) {
             if(!ValidationUtil.isEmpty(objectd)) {
-                sendSms(object, SMSEnum.重大质量问题短信.getCode());
+                sendSms(object, SMSEnum.重大问题整改完成短信.getCode());
             }
         }
 
@@ -142,45 +149,92 @@ public class ProblemInitiationServiceImpl {
             System.out.println("任务完成失败："+e.getMessage());
         } finally {
             //更新problem中的status字段，表示当前流程下一个执行的任务
+            qualityProblemService.updateById(objectd);
             updateProBlemFlowStatus(instanceId);
             QualityProblem quality = qualityProblemService.getById(objectd.getSequenceNbr());
             objectd.setStatus(quality.getStatus());
         }
     }
 
-
+    /**
+     * 项目立项及质量问题闭环处理 发送短信具体模板
+     * @param object
+     * @param smsCode
+     */
     public void sendSms(JSONObject object, String smsCode){
         Long sequenceNbr = object.getLong("sequenceNbr");
-        if(SMSEnum.项目安装告知申请.getCode().equals(smsCode)){
         //设置短信发送的基本参数
         HashMap<String, String> smsParams = new HashMap();
         smsParams.put("smsCode", smsCode);
         smsParams.put("projectName", object.getString("projectName"));
+        smsParams.put("problemDescribe", object.getString("problemDescribe"));
         smsParams.put("CompanyName", object.getString("CompanyName"));
-            //条件构造器 通过项目id查出来的项目详情信息中的区域代码，在监管区域规则表中拿到详细信息中的监察部门id，在使用监察部门id拿到平台的监察部门id
-            LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(object.getLong("projectId")).getInstallRegionCode());
-            String noticeUnitId = orgUsrServiceImpl.getById(superviseRuleServiceImpl.getOne(wrapper).getSuperviseDeptId()).getAmosOrgId();
-            sendMessage(sequenceNbr,noticeUnitId,smsParams,smsCode,supervisionRoleId,object);
+        if(SMSEnum.项目安装告知申请.getCode().equals(smsCode)){
+            //给监察发短信
+            sendTo(OrgEnum.监察部门.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
         }else if(SMSEnum.项目立项驳回短信.getCode().equals(smsCode)) {
-            //设置短信发送的基本参数
-            HashMap<String, String> smsParams = new HashMap();
-            smsParams.put("smsCode", smsCode);
-            smsParams.put("projectName", object.getString("projectName"));
-            smsParams.put("reviewInfo", object.getString("reviewInfo"));
+            //给监察发短信
+            sendTo(OrgEnum.监察部门.getKey(),object.getLong("sequenceNbr"),sequenceNbr,smsParams,smsCode,object);
+            //给安装发短信
+            sendTo(OrgEnum.安装单位.getKey(),object.getLong("sequenceNbr"),sequenceNbr,smsParams,smsCode,object);
+        }else if(SMSEnum.重大质量问题短信.getCode().equals(smsCode)){
+            //给监察发短信
+            sendTo(OrgEnum.监察部门.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+        }else if(SMSEnum.超期整改短信.getCode().equals(smsCode)){
+            //给安装发短信
+            sendTo(OrgEnum.建设单位.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+            //给安装发短信
+            sendTo(OrgEnum.监检机构.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+            //给安装发短信
+            sendTo(OrgEnum.安装单位.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+            //给监察发短信
+            sendTo(OrgEnum.监察部门.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+        }else if(SMSEnum.重大问题整改完成短信.getCode().equals(smsCode)){
+            //给监察发短信
+            sendTo(OrgEnum.监察部门.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+        }else if (SMSEnum.质量问题短信.getCode().equals(smsCode)) {
+            //给安装发短信
+            sendTo(OrgEnum.建设单位.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+            //给安装发短信
+            sendTo(OrgEnum.监检机构.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+            //给安装发短信
+            sendTo(OrgEnum.安装单位.getKey(),object.getLong("projectId"),sequenceNbr,smsParams,smsCode,object);
+        }
+    }
+
+    /**
+     * 发送短信给监检/安装/监察/建设
+     * @param nameKey
+     * @param projectId
+     * @param sequenceNbr
+     * @param smsParams
+     * @param smsCode
+     * @param object
+     */
+    public void sendTo(String nameKey,Long projectId,Long sequenceNbr,HashMap<String, String> smsParams,String smsCode,JSONObject object){
+        if(OrgEnum.监检机构.getKey().equals(nameKey)){
+            LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(projectId).getInstallRegionCode());
+            String MonitoringUnitId = orgUsrServiceImpl.getById(superviseRuleServiceImpl.getOne(wrapper).getInspectionUnitId()).getAmosOrgId();
+            sendMessage(sequenceNbr,MonitoringUnitId,smsParams,smsCode,monitoringRoleId,object);
+        } else if (OrgEnum.安装单位.getKey().equals(nameKey)){
+            //给安装发短信
+            String installationUnitId = orgUsrServiceImpl.getById(projectServiceImpl.getById(projectId).getInstallationUnitId()).getAmosOrgId();
+            sendMessage(sequenceNbr,installationUnitId,smsParams,smsCode,installationRoleId,object);
+        } else if (OrgEnum.监察部门.getKey().equals(nameKey)){
             //给监察发短信
             LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(object.getLong("sequenceNbr")).getInstallRegionCode());
+            wrapper.eq(SuperviseRule::getAdminRegionCode, projectServiceImpl.getById(projectId).getInstallRegionCode());
             String supervisionUnitId = orgUsrServiceImpl.getById(superviseRuleServiceImpl.getOne(wrapper).getSuperviseDeptId()).getAmosOrgId();
             sendMessage(sequenceNbr,supervisionUnitId,smsParams,smsCode,supervisionRoleId,object);
-            //给安装发短信
-            String installationUnitId = orgUsrServiceImpl.getById(projectServiceImpl.getById(object.getLong("sequenceNbr")).getInstallationUnitId()).getAmosOrgId();
-            sendMessage(sequenceNbr,installationUnitId,smsParams,smsCode,installationRoleId,object);
+        } else if (OrgEnum.建设单位.getKey().equals(nameKey)){
+            //给建设发短信
+            String installationUnitId = orgUsrServiceImpl.getById(projectServiceImpl.getById(projectId).getConstructionUnitId()).getAmosOrgId();
+            sendMessage(sequenceNbr,installationUnitId,smsParams,smsCode,constructionRoleId,object);
         }
 
     }
 
-
     /**
      * 发送短信
      * @param sequenceNbr 任务id（项目/问题）
@@ -213,13 +267,22 @@ public class ProblemInitiationServiceImpl {
                 if(SMSEnum.项目安装告知申请.getCode().equals(smsCode) || SMSEnum.项目立项驳回短信.getCode().equals(smsCode)){
                     saveProjectSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel,object,smsCode);
                 }else {
-                    saveProblemSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel);
+                    saveProblemSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel,object,smsCode);
                 }
 
             }
         }
     }
 
+    /**
+     * 存 项目立项流程中 发送的短信信息
+     * @param smsRecordModel
+     * @param sequenceNbr
+     * @param noticeUnitId
+     * @param agencyUserModel
+     * @param object
+     * @param smsCode
+     */
     public void saveProjectSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel,JSONObject object,String smsCode){
         String content = Systemctl.smsTemplateClient.seleteOne(smsCode).getResult().getSmsContent();
         String projectName = object.getString("projectName");
@@ -253,7 +316,31 @@ public class ProblemInitiationServiceImpl {
         installNoticeMsgService.save(installNoticeMsg);
     }
 
-    public void saveProblemSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel){
+    /**
+     * 存 质量问题闭环处理流程中 发送的短信信息
+     * @param smsRecordModel
+     * @param sequenceNbr
+     * @param noticeUnitId
+     * @param agencyUserModel
+     * @param object
+     * @param smsCode
+     */
+    public void saveProblemSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel,JSONObject object,String smsCode){
+        String content = Systemctl.smsTemplateClient.seleteOne(smsCode).getResult().getSmsContent();
+        String projectName = object.getString("projectName");
+        String problemDescribe = object.getString("problemDescribe");
+
+        if(!ValidationUtil.isEmpty(projectName)){
+            if(content.contains("${projectName}")) {
+                content = content.replace("${projectName}", projectName);
+            }
+        }
+        if(!ValidationUtil.isEmpty(problemDescribe)){
+            if(content.contains("${problemDescribe}")){
+                content = content.replace("${problemDescribe}",problemDescribe);
+            }
+        }
+
         LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
         wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
         RectifyMsg rectifyMsg = new RectifyMsg();
@@ -265,7 +352,13 @@ public class ProblemInitiationServiceImpl {
         rectifyMsgServiceImpl.save(rectifyMsg);
     }
 
-
+    /**
+     * 发送短信公用模板
+     * @param smsCode
+     * @param mobile
+     * @param smsParams
+     * @return
+     */
     public SmsRecordModel sendSmsMassage(String smsCode, String mobile, HashMap<String, String> smsParams){
         SmsRecordModel smsRecordModel = new SmsRecordModel();
 

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

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 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.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 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.dto.ProjectMaterialDto;
+import com.yeejoin.amos.boot.module.ugp.api.dto.WelderDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.*;
 import com.alibaba.fastjson.JSON;
@@ -16,9 +18,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.MaterialMapper;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper;
+import com.yeejoin.amos.boot.module.ugp.api.mapper.WeldMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IProjectResourceService;
 import com.yeejoin.amos.boot.module.ugp.api.dto.ProjectResourceDto;
 import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
+import org.apache.ibatis.annotations.Case;
 import org.aspectj.weaver.ast.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +32,7 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.*;
 
@@ -136,7 +141,7 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
     /**
      * 绑定项目所用到的设备管材
      */
-    public ProjectResource saveIds(JSONObject jsonObject) throws Exception {
+    public ResponseModel saveIds(JSONObject jsonObject) throws Exception {
         JSONArray subForm = jsonObject.getJSONArray("subForm");
         ProjectResource Resource = new ProjectResource();
 
@@ -148,10 +153,10 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
             Long SequenceNbr = Long.valueOf(jsonObject.getString("sequenceNbr"));
             String type = jsonObject.getString("type");
             LambdaQueryWrapper<ProjectResource> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(ProjectResource::getResourceId,select);
-            wrapper.eq(ProjectResource::getProjectId,SequenceNbr);
+            wrapper.eq(ProjectResource::getResourceId, select);
+            wrapper.eq(ProjectResource::getProjectId, SequenceNbr);
             ProjectResource projectResourceVerify = projectResourceMapper.selectOne(wrapper);
-            if (ValidationUtil.isEmpty(projectResourceVerify)){
+            if (ValidationUtil.isEmpty(projectResourceVerify)) {
                 //判断资源类型并插入
                 if (type.equals(设备资源.getName())) {
                     projectResource.setType(设备资源.getCode());
@@ -171,13 +176,23 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
 
                 projectResource.setProjectId(SequenceNbr);
                 projectResource.setResourceId(Long.valueOf(select));
-            BeanUtils.copyProperties(projectResource,Resource);
-            this.save(projectResource);
-                }else {
-               throw new Exception("该资源已存在");
+                BeanUtils.copyProperties(projectResource, Resource);
+                boolean save = this.save(projectResource);
+                //判断
+                if (save && type.equals(设备资源.getName())) {
+                    LambdaQueryWrapper<Equipment> wrapperEquipment = new LambdaQueryWrapper<>();
+                    wrapperEquipment.eq(BaseEntity::getSequenceNbr, select);
+                    Equipment equipment = new Equipment();
+                    equipment.setUseStatus("已使用");
+                    equipmentMapper.update(equipment, wrapperEquipment);
+
+                }
+            } else {
+//               throw new Exception("该资源已存在");
+                return CommonResponseUtil.failure("该资源已存在");
             }
         }
-        return Resource;
+        return CommonResponseUtil.success();
     }
 
 

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

@@ -214,9 +214,11 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
                 install=true;
             }
         }
-
-        if(design && install){
-            projectInitiationService.execute(project.getInstanceId(),projectDto,"1");
+        String type = jsonObject.getString("type");
+        if (type != null) {
+            if (design && install) {
+                projectInitiationService.execute(project.getInstanceId(), projectDto, "1");
+            }
         }
         return "ok";
     }

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemProcessEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.ProblemTypeEnum;
+import com.yeejoin.amos.boot.module.ugp.api.entity.Project;
 import com.yeejoin.amos.boot.module.ugp.api.entity.QualityProblem;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.QualityProblemMapper;
 import com.yeejoin.amos.boot.module.ugp.api.service.IQualityProblemService;
@@ -12,9 +13,7 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 质量问题表服务实现类
@@ -34,6 +33,9 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
     @Autowired
     OrgServiceImpl orgService;
 
+    @Autowired
+    ProjectResourceServiceImpl projectResourceService;
+
     /**
      * 分页查询
      */
@@ -50,11 +52,15 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
 
     @Override
     public IPage<QualityProblemDto> getItems(String current, String size,QualityProblemDto qualityProblemDto) {
+        Set<String> projectIds = new HashSet<>();
+        for(Project project:projectResourceService.getProjectList()){
+            projectIds.add(String.valueOf(project.getSequenceNbr()));
+        }
         List<QualityProblemDto> list = new ArrayList<>();
         IPage<QualityProblemDto> page = new Page<>();
         page.setCurrent(Long.parseLong(current));
         page.setSize(Long.parseLong(size));
-        page = qualityProblemMapper.getItems(page,qualityProblemDto);
+        page = qualityProblemMapper.getItems(page,qualityProblemDto,projectIds);
         List<QualityProblemDto> qualityProblemDtoList = page.getRecords();
         for (QualityProblemDto qualityProblemDto1 : qualityProblemDtoList) {
             qualityProblemDto1.setChargerPersonName(orgService.getOrgUsrById(qualityProblemDto1.getChargerPersonId()).getBizOrgName());
@@ -132,8 +138,6 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
 
             }
         }
-
-        this.updateById(quality);
         return "0k";
     }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/resources/application.properties

@@ -45,3 +45,5 @@ amos.system.user.app-key=AMOS_STUDIO
 
 supervisionRoleId=1582983768581369857
 installationRoleId=1585099284334800898
+monitoringRoleId=1585099377079250946
+constructionRoleId=1585099241989107713
\ No newline at end of file