Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/controller/CwFinanceInvoiceController.java

@@ -325,7 +325,7 @@ public class CwFinanceInvoiceController {
 
     @ApiLog(value = "导出发票数据", type = LogTypeEnum.EXPORT)
     @GetMapping("export")
-    @PreAuthorize ("hasAuthority('cwProjectRecords:export')")
+    //@PreAuthorize ("hasAuthority('cw_finance:invoice:export')")
     @ApiOperation(value = "导出发票数据")
     public void exportFile(CwFinanceInvoiceDTO cwFinanceInvoiceDTO, Page <CwFinanceInvoiceDTO> page, ExcelOptions options, HttpServletResponse response) throws Exception {
         String fileName = options.getFilename();

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/projectReportArchive/mapper/xml/CwProjectReportArchiveMapper.xml

@@ -240,6 +240,7 @@
         from cw_project_report_archive cw_pa
         left join cw_work_client_base cw_wcb on cw_pa.audited_units = cw_wcb.id and cw_wcb.del_flag = '0'
         left join sys_user su on su.id = cw_pa.create_by and su.del_flag = '0'
+        left join sys_office so on so.id = su.office_id and so.del_flag ='0'
         left join cw_project_records cw_pr on cw_pr.id = cw_pa.project_id and cw_pr.del_flag = '0'
         left join sys_user su1 on cw_pr.project_master_id = su1.id and su1.del_flag = '0'
         left join cw_project_report_new_line cw_prnl on cw_prnl.report_id = cw_pa.report_id and cw_prnl.del_flag = '0'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/program/configuration/projectList/service/ProjectListService.java

@@ -232,24 +232,22 @@ public class ProjectListService {
                         if (StringUtils.isNotBlank(programProjectListInfo.getContractId())) {
                             String contractId = programProjectListInfo.getContractId();
                             WorkContractInfo contract = workContractInfoMapper.findById(contractId);
-                            if (ObjectUtil.isNotEmpty(contract)) {
-                                if (StringUtils.isBlank(contract.getNo())) {
-                                    if (StringUtils.isNotBlank(programProjectListInfo.getReportType())) {
-                                        if ("1".equals(programProjectListInfo.getReportType())) {
-                                            // 生成合同编号-评估类
-                                            String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
-                                            // 根据合同id和合同编号来修改合同数据
-                                            WorkContractInfo workContractInfo = new WorkContractInfo();
-                                            workContractInfo.setNo(serialNum);
-                                            workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
-                                        }else if("2".equals(programProjectListInfo.getReportType())){
-                                            // 生成合同编号-咨询类
-                                            String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE_);
-                                            // 根据合同id和合同编号来修改合同数据
-                                            WorkContractInfo workContractInfo = new WorkContractInfo();
-                                            workContractInfo.setNo(serialNum);
-                                            workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
-                                        }
+                            if (ObjectUtil.isNotEmpty(contract) && StringUtils.isBlank(contract.getNo())) {
+                                if (StringUtils.isNotBlank(programProjectListInfo.getReportType())) {
+                                    if ("1".equals(programProjectListInfo.getReportType())) {
+                                        // 生成合同编号-评估类
+                                        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
+                                        // 根据合同id和合同编号来修改合同数据
+                                        WorkContractInfo workContractInfo = new WorkContractInfo();
+                                        workContractInfo.setNo(serialNum);
+                                        workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
+                                    }else if("2".equals(programProjectListInfo.getReportType())){
+                                        // 生成合同编号-咨询类
+                                        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE_);
+                                        // 根据合同id和合同编号来修改合同数据
+                                        WorkContractInfo workContractInfo = new WorkContractInfo();
+                                        workContractInfo.setNo(serialNum);
+                                        workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
                                     }
                                 }
                             }
@@ -447,24 +445,22 @@ public class ProjectListService {
                         if (StringUtils.isNotBlank(programProjectListInfo.getContractId())) {
                             String contractId = programProjectListInfo.getContractId();
                             WorkContractInfo contract = workContractInfoMapper.findById(contractId);
-                            if (ObjectUtil.isNotEmpty(contract)) {
-                                if (StringUtils.isBlank(contract.getNo())) {
-                                    if (StringUtils.isNotBlank(programProjectListInfo.getReportType())) {
-                                        if ("1".equals(programProjectListInfo.getReportType())) {
-                                            // 生成合同编号-评估类
-                                            String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
-                                            // 根据合同id和合同编号来修改合同数据
-                                            WorkContractInfo workContractInfo = new WorkContractInfo();
-                                            workContractInfo.setNo(serialNum);
-                                            workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
-                                        }else if("2".equals(programProjectListInfo.getReportType())){
-                                            // 生成合同编号-咨询类
-                                            String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE_);
-                                            // 根据合同id和合同编号来修改合同数据
-                                            WorkContractInfo workContractInfo = new WorkContractInfo();
-                                            workContractInfo.setNo(serialNum);
-                                            workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
-                                        }
+                            if (ObjectUtil.isNotEmpty(contract) && StringUtils.isBlank(contract.getNo())) {
+                                if (StringUtils.isNotBlank(programProjectListInfo.getReportType())) {
+                                    if ("1".equals(programProjectListInfo.getReportType())) {
+                                        // 生成合同编号-评估类
+                                        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE);
+                                        // 根据合同id和合同编号来修改合同数据
+                                        WorkContractInfo workContractInfo = new WorkContractInfo();
+                                        workContractInfo.setNo(serialNum);
+                                        workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
+                                    }else if("2".equals(programProjectListInfo.getReportType())){
+                                        // 生成合同编号-咨询类
+                                        String serialNum = serialnumTplService.genSerialNum(userDTO.getCompanyDTO().getId(), WorkContractInfoDto.BIZ_CODE_);
+                                        // 根据合同id和合同编号来修改合同数据
+                                        WorkContractInfo workContractInfo = new WorkContractInfo();
+                                        workContractInfo.setNo(serialNum);
+                                        workContractInfoMapper.update(workContractInfo, new QueryWrapper<WorkContractInfo>().lambda().eq(WorkContractInfo::getId, contractId));
                                     }
                                 }
                             }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/signature/utils/SignaturePostUtil.java

@@ -552,6 +552,8 @@ public class SignaturePostUtil {
     public static HashMap getDocument(File srcFile) {
         //截取文件后缀名
         String substring = srcFile.getName().substring(srcFile.getName().lastIndexOf(".")+1, srcFile.getName().length());
+        //截取文件名称
+        String fileName = srcFile.getName().substring(0,srcFile.getName().lastIndexOf("."));
         //添加请求头
         Map<String,String> requestHeaderMap = new HashMap<>();
         requestHeaderMap.put("x-qys-accesstoken", apptoken);
@@ -559,7 +561,7 @@ public class SignaturePostUtil {
         requestHeaderMap.put("x-qys-timestamp", "0");
         //添加文件参数
         Map<String,String> formTextsMap = new HashMap<>();
-        formTextsMap.put("title",srcFile.getName());
+        formTextsMap.put("title",fileName);
         formTextsMap.put("fileType",substring);
         //创建文件数组
         File[] files = new File[]{srcFile};