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/Enum/ProblemProcessEnum.java

@@ -14,12 +14,12 @@ public enum ProblemProcessEnum {
     重大问题发送短信("重大问题发送短信","3","ZDWTFSDX","","",""),
     编制处理方案("编制处理方案","4","BZCLFA","问题处理方案待编制","编制处理方案","待编制"),
     审查处理方案("审查处理方案","5","SCCLFA","问题处理方案待审查","审查处理方案","待审查"),
-    提交整改书("提交整改书","6","TJZGGC","问题处理方案待提交","提交整改书","待提交"),
+    提交整改书("提交整改书","6","TJZGGC","问题整改书待提交","提交整改书","待提交"),
     审查整改过程("审查整改过程","7","SCZGGC","问题处理方案待审核","审查整改过程","待审查"),
     超期整改发送短信("超期整改发送短信","8","CQZGFSDX","问题待处理","",""),
-    问题分类("问题分类","9","WTFL","问题待处理","问题分类","待分类"),
+    问题分类("问题分类","9","WTFL","问题待分类","问题分类","待分类"),
     转人工("转人工","10","ZRG","问题已转人工","转人工","等待人工处理"),
-    结束("结束","11","JS","问题已处理","",""),
+    结束("流程结束！","11","JS","问题已处理","",""),
     重大问题整改完成发送短信("重大问题整改完成发送短信","12","ZDWTZGWCFSDX","问题已处理","","");
 
     private String Name;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/constants/XJConstant.java

@@ -22,8 +22,8 @@ public class XJConstant {
     public static final String DEPT_WF_MAP_DIC_CODE = "DEPT_WF_MAP";
 
 //附件默认值
-    public static final String INSTALL_SUB_FORM="[{\"Symbol_key\":\"B83A18D2-FF89-47D2-BEA2-BAA097E09783\",\"subFormInstall\":\"材质证明文件\",\"info\":\"\",\"type\":\"\"},{\"Symbol_key\":\"DB0306C1-3520-4BB4-93CE-44DA95AAD408\",\"subFormInstall\":\"焊接工艺评定报告\",\"info\":\"\",\"type\":\"\"}]";
-    public static final String DESIGN_SUB_FORM="[{\"Symbol_key\":\"314C727B-A6A7-40F1-9CFC-C354748657F7\",\"subFormAttachment\":\"设计文件\",\"info\":\"\",\"type\":\"\"},{\"Symbol_key\":\"5F3B660B-25A2-420C-919E-60F74CE1F36A\",\"subFormAttachment\":\"施工组织设计文件\",\"info\":\"\",\"type\":\"\"}]";
+    public static final String INSTALL_SUB_FORM="[{\"Symbol_key\":\"B83A18D2-FF89-47D2-BEA2-BAA097E09783\",\"subFormInstall\":\"材质证明文件\",\"info\":\"\",\"type\":\"安装单位\"},{\"Symbol_key\":\"DB0306C1-3520-4BB4-93CE-44DA95AAD408\",\"subFormInstall\":\"焊接工艺评定报告\",\"info\":\"\",\"type\":\"安装单位\"}]";
+    public static final String DESIGN_SUB_FORM="[{\"Symbol_key\":\"314C727B-A6A7-40F1-9CFC-C354748657F7\",\"subFormAttachment\":\"设计文件\",\"info\":\"\",\"type\":\"设计单位\"},{\"Symbol_key\":\"5F3B660B-25A2-420C-919E-60F74CE1F36A\",\"subFormAttachment\":\"施工组织设计文件\",\"info\":\"\",\"type\":\"设计单位\"}]";
     //人员org数值
     public static final int ORG_CODE=18;
     public static final int ORG_CODE_USER=12;

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

@@ -13,7 +13,9 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
 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.CompanyExamineEnum;
 import com.yeejoin.amos.boot.module.ugp.api.Enum.CompanyTypeEnum;
+import com.yeejoin.amos.boot.module.ugp.api.Enum.OrgEnum;
 import com.yeejoin.amos.boot.module.ugp.api.constants.XJConstant;
 import com.yeejoin.amos.boot.module.ugp.api.entity.Company;
 import com.yeejoin.amos.boot.module.ugp.api.mapper.CompanyMapper;
@@ -109,6 +111,7 @@ public class CompanyController extends BaseController {
 			String url = object.getString("url");
 			adminLincensePic.add(url);
 		}
+		model.setApproved(CompanyExamineEnum.企业审核.getNo());
 		model.setAdminLincensePic(JSON.toJSONString(adminLincensePic));
 	    return ResponseHelper.buildResponse(companyServiceImpl.createWithModel(model));
 	}
@@ -166,6 +169,10 @@ public class CompanyController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "企业信息表分页查询",  notes = "企业信息表分页查询")
 	public ResponseModel<IPage<CompanyDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
                     (value = "size") int size, Company company) {
+		List<CompanyDto> companyDtos = companyServiceImpl.queryCompanyPage(current,size,company).getRecords();
+		for (CompanyDto companyDto : companyDtos) {
+		    companyDto.setType(OrgEnum.map.get(companyDto.getType()));
+		}
 		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/service/impl/ProjectServiceImpl.java

@@ -233,7 +233,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
             JSONObject jo = JSON.parseObject(JSON.toJSONString(object));
             String type = jo.getString("type");
             String info = jo.getString("info");
-            if (OrgEnum.安装单位.getName().equals(type) && ValidationUtil.isEmpty(info)){
+            if (OrgEnum.安装单位.getName().equals(type) && !ValidationUtil.isEmpty(info)){
                 install=true;
             }else {
                 install=false;
@@ -244,7 +244,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
             JSONObject jo = JSON.parseObject(JSON.toJSONString(object));
             String type = jo.getString("type");
             String info = jo.getString("info");
-            if (OrgEnum.设计单位.getName().equals(type) && ValidationUtil.isEmpty(info)){
+            if (OrgEnum.设计单位.getName().equals(type) && !ValidationUtil.isEmpty(info)){
                 design=true;
             }else {
                 design=false;

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

@@ -132,7 +132,7 @@ public class QualityProblemServiceImpl extends BaseService<QualityProblemDto,Qua
             //获取ProblemType状态
             if(quality.getProblemType()){
                 //拿到qualityProblem更新到数据库
-                quality.setSubmitDate(qualityProblem.getDateTime());
+                quality.setReformLimitDate(qualityProblem.getDateTime());
                 problemInitiationService.execute(quality.getInstanceId(),quality,"0");
             }else {
                 problemInitiationService.execute(quality.getInstanceId(),quality,"1");