党建bug修改

101captain

2022-03-31 07e29422c8559295bd6a5594e6f95f9e08d0bc95

党建bug修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/excel/ComPbMemberRoleExcelVo.java

@@ -37,4 +37,6 @@
    @ExcelProperty(value = "岗位职责", index = 7)
    private String jobResponsibilities;

    @ExcelProperty(value = "负责党支部", index = 8)
    private String org;
}

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java

@@ -1071,7 +1071,12 @@
                        mistakes.add(roleErrorExcelVo);
                        return;
                    }

                    if(StringUtils.isNotEmpty(memberRole.getOrg())){
                        ComPbOrgDO comPbOrgDO=comPbOrgDAO.selectOne(new QueryWrapper<ComPbOrgDO>().lambda().eq(ComPbOrgDO::getName,memberRole.getOrg()));
                        if(comPbOrgDO!=null){
                            memberRoleDO.setOrgId(comPbOrgDO.getId());
                        }
                    }
                    try {
                        Date employmentTime = DateUtils.stringToDate(memberRole.getEmploymentTime(),DateUtils.yyyyMMdd_format);
                        memberRoleDO.setEmploymentTime(employmentTime);