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

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

@@ -7,6 +7,8 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.AttachmentServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -123,7 +125,7 @@ public class AttachmentController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/unit")
 	@ApiOperation(httpMethod = "Get",value="单位选择查询",notes= "单位选择查询")
-	public ResponseModel<String> selectUnit(){
+	public ResponseModel<Map> 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/WelderController.java

@@ -210,6 +210,11 @@ public class WelderController extends BaseController {
         page = orgServiceImpl.getPersonInfo(String.valueOf(orgServiceImpl.getReginParams().getBusinessInfo().getCompanySequenceNbr()),page);
         List<Map> mapList = page.getRecords();
         for(Map map : mapList){
+            try {
+                map.put("dept", orgServiceImpl.getOrgUsrById(String.valueOf(map.get("deptId"))).getBizOrgName());
+            } catch (Exception e) {
+                map.put("dept",String.valueOf(map.get("deptId")));
+            }
             if(OrgEnum.焊工.getKey().equals((String)map.get("type"))){
                 map.put("typeName",OrgEnum.焊工.getName());
             }else{

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

@@ -17,7 +17,11 @@ 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.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.yeejoin.amos.boot.module.ugp.biz.controller.ProjectController;
 
 
@@ -81,14 +85,16 @@ public class AttachmentServiceImpl extends BaseService<AttachmentDto,Attachment,
      *
      */
     @BusinessIdentify
-    public String selectUnit(){
+    public Map selectUnit(){
+        Map map = new HashMap<>();
         //获取登录人的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);
+        map.put("type",OrgEnum.map.get(key));
+        return map;
     }
 
 }
\ 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/OrgServiceImpl.java

@@ -153,17 +153,14 @@ public class OrgServiceImpl {
             //判断筛选条件
             if (!ValidationUtil.isEmpty(jsonObject.getLong("isCheck"))) {
                 wrapper.eq(OrgUsr :: getAmosOrgId,jsonObject.getLong("isCheck"));
-            } else {
+            } else if(!jsonObject.getString("deptId").isEmpty()) {
                 //设置所属机构
-                //判断是否存在监检机构id
-                if(!jsonObject.getString("dept").isEmpty()){
-                    wrapper.eq(BaseEntity::getSequenceNbr,jsonObject.getString("dept"));
-                    orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
-                }else {
+                //判断是否存在部门id
+                wrapper.eq(OrgUsr::getSequenceNbr,jsonObject.getString("deptId"));
+            } else {
                 wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
-                    orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
-                }
             }
+            orgUsr.setParentId(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
         }
         if (OrgEnum.部门.getKey().equals(bizOrgType)) {
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();

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

@@ -210,10 +210,10 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         for(Object object:subForm){
             JSONObject jo = JSON.parseObject(JSON.toJSONString(object));
             String type = jo.getString("type");
-            if (OrgEnum.设计单位.getKey().equals(type)){
+            if (OrgEnum.设计单位.getName().equals(type)){
                 design=true;
             }
-            if (OrgEnum.安装单位.getKey().equals(type)){
+            if (OrgEnum.安装单位.getName().equals(type)){
                 install=true;
             }
         }