优化接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -84,4 +84,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     List< OrgUsrExcelDto> exportPersonToExcelByParentId(Long parentId);
 
     List<OrgUsr> amosIdExist(String amosId);
+
+
+    void updatelistByParentId(String codex, String code);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -569,4 +569,14 @@ GROUP BY
             amos_org_id = #{amosId}
     </select>
 
+
+    <update id="updatelistByParentId">
+
+     UPDATE cb_org_usr
+     SET biz_org_code=replace(biz_org_code,#{code},#{codex})
+     WHERE biz_org_code like concat(#{code}, '%');
+
+    </update>
+
+
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -413,6 +413,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return formValue;
     }
 
+
+
+
     @Override
     public void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception {
 
@@ -648,24 +651,31 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgUsrVo, orgUsr);
+        //判断是否修改所属单位
+        if(!(oriOrgUsr.getParentId()!=null?oriOrgUsr.getParentId():"").equals(OrgUsrVo.getParentId())){
+
             /*单位编辑后 code值也应做出修改 2021-09-09 陈召 开始 */
             OrgUsr parent = getById(OrgUsrVo.getParentId());
             if (parent != null) {
                 orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
             }
-        orgUsr.setSequenceNbr(id);
+           // orgUsr.setSequenceNbr(id);
             // 查询机构下的所有部门单位人员数据，进行bizOrgCode的统一修改  BUG 2880  by litw start 2021年9月16日
-        String oriOrgCode = oriOrgUsr.getBizOrgCode();
-        Map<String, Object> columnMap = new HashMap<>();
-        columnMap.put("bizOrgCode", oriOrgCode);
-        List<OrgUsr> list = orgUsrMapper.selectAllChildrenList(columnMap);
-        list.stream().forEach(e -> {
-            e.setBizOrgCode(e.getBizOrgCode().replace(oriOrgCode, orgUsr.getBizOrgCode()));
-        });
-        this.updateBatchById(list);
+//            String oriOrgCode = oriOrgUsr.getBizOrgCode();
+//            Map<String, Object> columnMap = new HashMap<>();
+//            columnMap.put("bizOrgCode", oriOrgCode);
+//            List<OrgUsr> list = orgUsrMapper.selectAllChildrenList(columnMap);
+//            list.stream().forEach(e -> {
+//                e.setBizOrgCode(e.getBizOrgCode().replace(oriOrgCode, orgUsr.getBizOrgCode()));
+//            });
+//            this.updateBatchById(list);
+//            /*单位编辑后 code值也应做出修改 2021-09-09 陈召 结束  */
+            orgUsrMapper.updatelistByParentId(orgUsr.getBizOrgCode(),oriOrgUsr.getBizOrgCode());
+       }
+            updateById(orgUsr);
+
+       // saveOrgUsr(orgUsr, oriOrgUsr);
 
-        /*单位编辑后 code值也应做出修改 2021-09-09 陈召 结束  */
-        saveOrgUsr(orgUsr, oriOrgUsr);
         // 保存动态表单数据
         updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgUsrVo.getDynamicFormValue());
         /**

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -1062,9 +1062,11 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 			data = initDutyCarTemplate(ids);
 		} else if (ExcelEnums.RYZB.getType().equals(excelDto.getType())) {
 			data = initDutyPersonTemplate(ids);
-		}else if(ExcelEnums.WXXFZB.getType().equals(excelDto.getType())){
-			data = initDutyDutyFireFightingTemplate(ids);
 		}
+
+//		else if(ExcelEnums.WXXFZB.getType().equals(excelDto.getType())){
+//			data = initDutyDutyFireFightingTemplate(ids);
+//		}
 		// 获取日期
 		List<Map<String, Object>> rangeDate = dutyPersonShiftService.getBaseMapper().genRangeDate(beginDate, endDate);
 		List<String> dayByMonth = new ArrayList<>();