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/dto/EquipmentDto.java

@@ -59,4 +59,6 @@ public class EquipmentDto  extends BaseDto {
     @ApiModelProperty(value = "单位机构代码")
     private String orgCode;
 
+    private String companyName;
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/InstallNoticeDto.java

@@ -57,4 +57,8 @@ public class InstallNoticeDto  extends BaseDto {
     @ApiModelProperty(value = "安装负责人")
     private String installPri;
 
+    private String projectName;
+
+    private String companyName;
+
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/ProjectDto.java

@@ -106,4 +106,5 @@ public class ProjectDto  extends BaseDto {
 
     private String insDep;
     private String insPerson;
+    private String startDateString;
 }

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

 package com.yeejoin.amos.boot.module.ugp.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
@@ -17,5 +18,5 @@ import java.util.List;
  */
 @Mapper
 public interface CompanyMapper extends BaseMapper<Company> {
-    List<CompanyDto> queryCompanyPage(Company companyParam);
+    IPage<CompanyDto> queryCompanyPage(IPage<CompanyDto> page,Company companyParam);
 }

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/ICompanyService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.api.service;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.ugp.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
@@ -14,7 +15,7 @@ import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
  */
 public interface ICompanyService {
 
-    Page<CompanyDto> queryCompanyPage(int current, int size,Company company);
+    IPage<CompanyDto> queryCompanyPage(int current, int size, Company company);
 
 
 

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

@@ -6,11 +6,11 @@
     <select id="queryCompanyPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Company">
         select * from tz_ugp_company
         <where>
-            <if test="name != '' and name != null">
-                and `name` like concat('%',#{name},'%')
+            <if test="companyParam.name != '' and companyParam.name != null">
+                and `name` like concat('%',#{companyParam.name},'%')
             </if>
-            <if test="type != '' and type != null">
-                and `type` like concat('%',#{type},'%')
+            <if test="companyParam.type != '' and companyParam.type != null">
+                and `type` like concat('%',#{companyParam.type},'%')
             </if>
         </where>
     </select>

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.EquipmentMapper">
 
-    <select id="queryEquipmentPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.entity.Equipment">
+    <select id="queryEquipmentPage"  resultType="com.yeejoin.amos.boot.module.ugp.api.dto.EquipmentDto">
         select * from tz_ugp_equipment
         <where>
             <if test="equipment.name != '' and equipment.name != null">

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

@@ -164,11 +164,10 @@ public class CompanyController extends BaseController {
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-	@GetMapping(value = "/page")
+	@PostMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询",  notes = "企业信息表分页查询")
-	public ResponseModel<Page<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size,Company company) {
-
+	public ResponseModel<IPage<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+                    (value = "size") int size,@RequestBody Company company) {
 		return ResponseHelper.buildResponse(companyServiceImpl.queryCompanyPage(current,size,company));
 	}
 

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

@@ -142,8 +142,14 @@ public class EquipmentController extends BaseController {
 		IPage<EquipmentDto> page = new Page<>();
 		page.setSize(size);
 		page.setCurrent(current);
-//		equipment.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
-		return ResponseHelper.buildResponse(equipmentServiceImpl.queryEquipmentPage(page,equipment));
+		page = equipmentServiceImpl.queryEquipmentPage(page,equipment);
+		List<EquipmentDto> equipments = page.getRecords();
+		if(!ValidationUtil.isEmpty(equipments)) {
+			for (EquipmentDto equipmentDto : equipments) {
+				equipmentDto.setCompanyName((String) orgService.getdetialInfo(String.valueOf(equipmentDto.getCompanyId())).get("name"));
+			}
+		}
+		return ResponseHelper.buildResponse(page);
 	}
 
 	/**

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

@@ -28,6 +28,7 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -77,7 +78,6 @@ public class ProjectController extends BaseController {
 	public ResponseModel<ProjectDto> save(@RequestBody ProjectDto model) {
 		String regionName = "",regionCode = "";
 		Map<String,String> map = getInfo(regionName,regionCode,Long.valueOf(model.getInstallRegionCode()));
-		model.setStartDate(new Date());
 		model.setSubmitDate(new Date());
 		model.setInstallationUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getInstallationUnitId())).getBizOrgName());
 		model.setDesignUnit(orgServiceImpl.getOrgUsrById(String.valueOf(model.getDesignUnitId())).getBizOrgName());
@@ -162,6 +162,8 @@ public class ProjectController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个项目信息表", notes = "根据sequenceNbr查询单个项目信息表")
 	public ResponseModel<ProjectDto> selectOne(@PathVariable Long sequenceNbr) {
+		ProjectDto projectDto = projectServiceImpl.queryBySeq(sequenceNbr);
+		projectDto.setStartDateString(new SimpleDateFormat("yyy-MM-dd HH:mm:ss").format(projectDto.getStartDate()));
 		return ResponseHelper.buildResponse(projectServiceImpl.queryBySeq(sequenceNbr));
 	}
 

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
@@ -62,24 +63,12 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
     /**
      * 分页查询+筛选
      */
-        public Page<CompanyDto> queryCompanyPage(int current, int size, Company company) {
-        Page<CompanyDto> page = new Page<>();
+    @Override
+    public IPage<CompanyDto> queryCompanyPage(int current, int size, Company company) {
+        IPage<CompanyDto> page = new Page<>();
         page.setSize(size);
         page.setCurrent(current);
-
-        this.list();
-            List<CompanyDto> companies = companyMapper.queryCompanyPage(company);
-//            List<CompanyDto> companyDtos = new ArrayList<>();
-//            BeanUtils.copyProperties(companies,companyDtos);
-            page.setRecords(companies);
-
-
-//            if (companyDto.getName() != null) {
-//            List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(companyDto.getName())).collect(Collectors.toList());
-//            page1.setRecords(collect);
-//        }
-
-        return page;
+        return companyMapper.queryCompanyPage(page,company);
     }
 
     /**

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

@@ -104,6 +104,8 @@ public class InstallNoticeServiceImpl extends BaseService<InstallNoticeDto,Insta
         InstallNoticeDto installNoticeDto = new InstallNoticeDto();
 		final ProjectDto projectDto = projectServiceImpl.queryBySeq(object.getLong("name"));
         installNoticeDto.setProjectId(object.getLong("name"));
+        installNoticeDto.setProjectName(projectDto.getName());
+        installNoticeDto.setCompanyName(projectDto.getInstallationUnit());
         installNoticeDto.setNoticeStatus(noticeStatus);
         installNoticeDto.setNoticeDate(new Date());
         installNoticeDto.setApproved(false);

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

 package com.yeejoin.amos.boot.module.ugp.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -77,7 +78,11 @@ public class OrgServiceImpl {
             BeanUtils.copyProperties(dynamicFormColumn, dynamicFormInstance);
             dynamicFormInstance.setFormColumnId(dynamicFormColumn.getSequenceNbr());
             //通过字段名去拿到表单传来的值
-            dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode()));
+            if("image".equals(dynamicFormColumn.getFieldCode())){
+                dynamicFormInstance.setFieldValue(JSON.toJSONString(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode())));
+            }else{
+                dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode()));
+            }
             dynamicFormInstance.setInstanceId(orgUsr.getSequenceNbr());
             dynamicFormInstance.setSequenceNbr(null);
             dynamicFormInstanceList.add(dynamicFormInstance);
@@ -235,7 +240,13 @@ public class OrgServiceImpl {
         map.put("type",type);
         map.put("sequenceNbr",sequenceNbr);
         for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
-            map.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue());
+            if("image".equals(dynamicFormInstance.getFieldCode())){
+                if(!ValidationUtil.isEmpty(dynamicFormInstance.getFieldValue())){
+                    map.put(dynamicFormInstance.getFieldCode(),JSON.parseArray(dynamicFormInstance.getFieldValue()));
+                }
+            } else {
+                map.put(dynamicFormInstance.getFieldCode(), dynamicFormInstance.getFieldValue());
+            }
         }
         return map;
     }

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

@@ -156,7 +156,7 @@ public class ProblemInitiationServiceImpl {
             HashMap<String, String> smsParams = new HashMap();
             smsParams.put("smsCode", smsCode);
             smsParams.put("projectName", object.getString("projectName"));
-            smsParams.put("problemDesc", object.getString("problemDesc"));
+            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());
@@ -211,7 +211,7 @@ public class ProblemInitiationServiceImpl {
                     continue;
                 }
                 if(SMSEnum.项目安装告知申请.getCode().equals(smsCode) || SMSEnum.项目立项驳回短信.getCode().equals(smsCode)){
-                    saveProjectSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel,object);
+                    saveProjectSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel,object,smsCode);
                 }else {
                     saveProblemSmsLog(smsRecordModel,sequenceNbr,noticeUnitId,agencyUserModel);
                 }
@@ -220,11 +220,32 @@ public class ProblemInitiationServiceImpl {
         }
     }
 
-    public void saveProjectSmsLog(SmsRecordModel smsRecordModel,Long sequenceNbr,String noticeUnitId,AgencyUserModel agencyUserModel,JSONObject object){
+    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");
+        String companyName = object.getString("companyName");
+        String reviewInfo = object.getString("reviewInfo");
+
+        if(!ValidationUtil.isEmpty(projectName)){
+            if(content.contains("${projectName}")) {
+                content = content.replace("${projectName}", projectName);
+            }
+        }
+        if(!ValidationUtil.isEmpty(companyName)){
+            if(content.contains("${companyName}")){
+                content = content.replace("${companyName}",companyName);
+            }
+        }
+        if(!ValidationUtil.isEmpty(reviewInfo)){
+            if(content.contains("${reviewInfo}")) {
+                content = content.replace("${reviewInfo}", reviewInfo);
+            }
+        }
+
         LambdaQueryWrapper<OrgUsr> wrapperQueryWrapper = new LambdaQueryWrapper<>();
         wrapperQueryWrapper.eq(OrgUsr::getAmosOrgId,agencyUserModel.getSequenceNbr());
         InstallNoticeMsg installNoticeMsg = new InstallNoticeMsg();
-        installNoticeMsg.setContent(smsRecordModel.getSmsContent());
+        installNoticeMsg.setContent(content);
         installNoticeMsg.setInstallNoticeId(object.getLong("sequenceNbr"));
         installNoticeMsg.setTargetUnitId(Long.valueOf(noticeUnitId));
         installNoticeMsg.setTargetPersonId(orgUsrServiceImpl.getOne(wrapperQueryWrapper).getSequenceNbr());

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

@@ -96,11 +96,27 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         }
         if(ProjectInitiationEnum.平台审核.getName().equals(project.getStatus())){
             if(ValidationUtil.isEmpty(state)){
-                state = "待审核";
+                state = "项目待审核";
             }
-        }else {
+        } else if (ProjectInitiationEnum.告知申请.getName().equals(project.getStatus())){
+            if(ValidationUtil.isEmpty(state)){
+                state = "告知待申请";
+            }
+        } else if (ProjectInitiationEnum.接受告知.getName().equals(project.getStatus())){
+            if(ValidationUtil.isEmpty(state)){
+                state = "告知待接收";
+            }
+        } else if (ProjectInitiationEnum.审查项目.getName().equals(project.getStatus())){
+            if(ValidationUtil.isEmpty(state)){
+                state = "告知待接收";
+            }
+        } else if (ProjectInitiationEnum.提交资料.getName().equals(project.getStatus())){
+            if(ValidationUtil.isEmpty(state)){
+                state = "资料待上传";
+            }
+        } else if(ProjectInitiationEnum.项目立项.getName().equals(project.getStatus())){
             if(ValidationUtil.isEmpty(state)){
-                state = "待上传资料";
+                state = "项目被驳回";
             }
         }