修改ugpbug

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

@@ -107,6 +107,7 @@ public class WelderController extends BaseController {
             OrgUsrDto orgUsrDto = welderServiceImpl.savePerson(jsonObject, bizOrgType, sequenceNbr);
             return ResponseHelper.buildResponse(orgUsrDto);
         }catch (Exception e){
+            e.printStackTrace();
             return CommonResponseUtil.failure("该用户绑定的手机号已存在，请更换号码");
         }
 

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

@@ -115,7 +115,7 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
                 MaterialDto materialDto = new MaterialDto();
                 BeanUtils.copyProperties(mt,materialDto);
                 materialDto.setFiles(attachmentService.getFilesBySourceId(mt.getSequenceNbr()));
-                materialDto.setStatus(map.get(mt.getSequenceNbr()));
+                materialDto.setStatus(!ValidationUtil.isEmpty(map.get(mt.getSequenceNbr()))?map.get(mt.getSequenceNbr()):"1");
                 materialDtoList.add(materialDto);
             }
         }

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

@@ -71,54 +71,56 @@ public class OrgServiceImpl {
      * @return
      */
     public OrgUsrDto dataHandling(JSONObject jsonObject, String bizOrgType,String sequenceNbr){
-        OrgUsr orgUsr = saveOrgUsr(jsonObject,bizOrgType,sequenceNbr);
-        sequenceNbr = String.valueOf(orgUsr.getSequenceNbr());
-        //条件构造器 找出column表种 类型为（COMPANY 或 DEPARTMENT 或 PERSON）的列
-        LambdaQueryWrapper<DynamicFormColumn> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(DynamicFormColumn::getGroupCode,bizOrgType);
-        List<DynamicFormColumn> dynamicFormColumnList= dynamicFormColumnServiceImpl.list(wrapper);
-        List<DynamicFormInstance> dynamicFormInstanceList = new ArrayList<>();
-        Map<String, Long> map = new HashMap<>();
-        for (DynamicFormColumn dynamicFormColumn : dynamicFormColumnList) {
-            //将column表的基本字段信息给instance表
-            DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
-            BeanUtils.copyProperties(dynamicFormColumn, dynamicFormInstance);
-            dynamicFormInstance.setFormColumnId(dynamicFormColumn.getSequenceNbr());
-            //通过字段名去拿到表单传来的值
-            if("image".equals(dynamicFormColumn.getFieldCode())){
-                if(!ValidationUtil.isEmpty(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode()))){
-                    dynamicFormInstance.setFieldValue(JSON.toJSONString(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode())));
+        synchronized (this) {
+            OrgUsr orgUsr = saveOrgUsr(jsonObject, bizOrgType, sequenceNbr);
+            sequenceNbr = String.valueOf(orgUsr.getSequenceNbr());
+            //条件构造器 找出column表种 类型为（COMPANY 或 DEPARTMENT 或 PERSON）的列
+            LambdaQueryWrapper<DynamicFormColumn> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(DynamicFormColumn::getGroupCode, bizOrgType);
+            List<DynamicFormColumn> dynamicFormColumnList = dynamicFormColumnServiceImpl.list(wrapper);
+            List<DynamicFormInstance> dynamicFormInstanceList = new ArrayList<>();
+            Map<String, Long> map = new HashMap<>();
+            for (DynamicFormColumn dynamicFormColumn : dynamicFormColumnList) {
+                //将column表的基本字段信息给instance表
+                DynamicFormInstance dynamicFormInstance = new DynamicFormInstance();
+                BeanUtils.copyProperties(dynamicFormColumn, dynamicFormInstance);
+                dynamicFormInstance.setFormColumnId(dynamicFormColumn.getSequenceNbr());
+                //通过字段名去拿到表单传来的值
+                if ("image".equals(dynamicFormColumn.getFieldCode())) {
+                    if (!ValidationUtil.isEmpty(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode()))) {
+                        dynamicFormInstance.setFieldValue(JSON.toJSONString(jsonObject.getJSONArray(dynamicFormInstance.getFieldCode())));
+                    }
+                } else {
+                    dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode()));
                 }
-            }else{
-                dynamicFormInstance.setFieldValue(jsonObject.getString(dynamicFormInstance.getFieldCode()));
+                dynamicFormInstance.setInstanceId(orgUsr.getSequenceNbr());
+                dynamicFormInstance.setSequenceNbr(null);
+                dynamicFormInstanceList.add(dynamicFormInstance);
             }
-            dynamicFormInstance.setInstanceId(orgUsr.getSequenceNbr());
-            dynamicFormInstance.setSequenceNbr(null);
-            dynamicFormInstanceList.add(dynamicFormInstance);
-        }
-        //如果sequenceNbr有值（更新）
-        if(!ValidationUtil.isEmpty(sequenceNbr)){
-            LambdaQueryWrapper<DynamicFormInstance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-            lambdaQueryWrapper.eq(DynamicFormInstance ::getInstanceId,orgUsr.getSequenceNbr());
-            List<DynamicFormInstance> instanceList = alertFormValueServiceImpl.list(lambdaQueryWrapper);
-            //如果instance表中有值
-            if(!ValidationUtil.isEmpty(instanceList)){
-                //将查到的instance信息装到map中
-                for(DynamicFormInstance dynamicFormInstance:instanceList){
-                    map.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getSequenceNbr());
-                }
-                //将查到的instance信息中的sequenceNbr装到更新之后的表中。
-                for(DynamicFormInstance dynamicFormInstance:dynamicFormInstanceList){
-                    dynamicFormInstance.setSequenceNbr(map.get(dynamicFormInstance.getFieldCode()));
+            //如果sequenceNbr有值（更新）
+            if (!ValidationUtil.isEmpty(sequenceNbr)) {
+                LambdaQueryWrapper<DynamicFormInstance> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                lambdaQueryWrapper.eq(DynamicFormInstance::getInstanceId, orgUsr.getSequenceNbr());
+                List<DynamicFormInstance> instanceList = alertFormValueServiceImpl.list(lambdaQueryWrapper);
+                //如果instance表中有值
+                if (!ValidationUtil.isEmpty(instanceList)) {
+                    //将查到的instance信息装到map中
+                    for (DynamicFormInstance dynamicFormInstance : instanceList) {
+                        map.put(dynamicFormInstance.getFieldCode(), dynamicFormInstance.getSequenceNbr());
+                    }
+                    //将查到的instance信息中的sequenceNbr装到更新之后的表中。
+                    for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
+                        dynamicFormInstance.setSequenceNbr(map.get(dynamicFormInstance.getFieldCode()));
+                    }
                 }
             }
+            //保存或更新 根据sequenceNbr
+            alertFormValueServiceImpl.saveOrUpdateBatch(dynamicFormInstanceList);
+            OrgUsrDto orgUsrDto = new OrgUsrDto();
+            BeanUtils.copyProperties(orgUsr, orgUsrDto);
+            orgUsrDto.setDynamicFormValue(dynamicFormInstanceList);
+            return orgUsrDto;
         }
-        //保存或更新 根据sequenceNbr
-        alertFormValueServiceImpl.saveOrUpdateBatch(dynamicFormInstanceList);
-        OrgUsrDto orgUsrDto = new OrgUsrDto();
-        BeanUtils.copyProperties(orgUsr,orgUsrDto);
-        orgUsrDto.setDynamicFormValue(dynamicFormInstanceList);
-        return orgUsrDto;
     }
 
     /**
@@ -226,28 +228,26 @@ public class OrgServiceImpl {
             orgUsr.setBizOrgCode(OrgUsrServiceImpl.getOrgCodeStr());
         }
 
-        synchronized (this) {
-            LambdaQueryWrapper<OrgUsr> orgUsrLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            orgUsrLambdaQueryWrapper.eq(OrgUsr::getBizOrgName, jsonObject.getString("name"));
-            OrgUsr orgUsrOld = orgUsrServiceImpl.getOne(orgUsrLambdaQueryWrapper);
-            if (ValidationUtil.isEmpty(orgUsrOld)) {
-                orgUsrServiceImpl.saveOrUpdate(orgUsr);
-            } else {
-                if (OrgEnum.普通人员.getKey().equals(bizOrgType)) {
+        LambdaQueryWrapper<OrgUsr> orgUsrLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        orgUsrLambdaQueryWrapper.eq(OrgUsr::getBizOrgName, jsonObject.getString("name"));
+        OrgUsr orgUsrOld = orgUsrServiceImpl.getOne(orgUsrLambdaQueryWrapper);
+        if (ValidationUtil.isEmpty(orgUsrOld)) {
+            orgUsrServiceImpl.saveOrUpdate(orgUsr);
+        } else {
+            if (OrgEnum.普通人员.getKey().equals(bizOrgType)) {
+                orgUsr.setSequenceNbr(orgUsrOld.getSequenceNbr());
+            }
+            if(OrgEnum.公司.getKey().equals(bizOrgType)) {
+                Long companyId = jsonObject.getLong("sequenceNbr");
+                if(!ValidationUtil.isEmpty(companyId)){
+                    orgUsr.setSequenceNbr(companyId);
+                } else {
                     orgUsr.setSequenceNbr(orgUsrOld.getSequenceNbr());
                 }
-                if(OrgEnum.公司.getKey().equals(bizOrgType)) {
-                    Long companyId = jsonObject.getLong("sequenceNbr");
-                    if(!ValidationUtil.isEmpty(companyId)){
-                        orgUsr.setSequenceNbr(companyId);
-                    } else {
-                        orgUsr.setSequenceNbr(orgUsrOld.getSequenceNbr());
-                    }
-                    orgUsrServiceImpl.getBaseMapper().updateIdByOrgName(orgUsr.getSequenceNbr(),orgUsr.getBizOrgName());
-                }
-                orgUsrServiceImpl.saveOrUpdate(orgUsr, orgUsrLambdaQueryWrapper);
-
+                orgUsrServiceImpl.getBaseMapper().updateIdByOrgName(orgUsr.getSequenceNbr(),orgUsr.getBizOrgName());
             }
+            orgUsrServiceImpl.saveOrUpdate(orgUsr, orgUsrLambdaQueryWrapper);
+
         }
 
         return orgUsr;

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

@@ -829,7 +829,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
                 projectResource.setResourceId(Long.valueOf(String.valueOf(item.get("sequence_nbr"))));
                 projectResource.setType("equipment");
                 projectResource.setName(String.valueOf(item.get("name")));
-                projectResource.setStatus(ObjectUtils.isEmpty(item.get(status)) ? "0" : String.valueOf(item.get(status)));
+                projectResource.setStatus("1");
                 projectResources.add(projectResource);
             });
         }
@@ -841,7 +841,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
                 projectResource.setResourceId(Long.valueOf(String.valueOf(item.get("sequenceNbr"))));
                 projectResource.setType("welder");
                 projectResource.setName(String.valueOf(item.get("name")));
-                projectResource.setStatus(ObjectUtils.isEmpty(item.get(status)) ? "0" : String.valueOf(item.get(status)));
+                projectResource.setStatus("1");
                 projectResources.add(projectResource);
             });
         }
@@ -853,7 +853,7 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
                 projectResource.setResourceId(Long.valueOf(String.valueOf(item.get("sequenceNbr"))));
                 projectResource.setType("material");
                 projectResource.setName(String.valueOf(item.get("name")));
-                projectResource.setStatus(ObjectUtils.isEmpty(item.get(status)) ? "0" : String.valueOf(item.get(status)));
+                projectResource.setStatus("1");
                 projectResources.add(projectResource);
             });
         }