代码提交

jeeplus-modules/jeeplus-assess/src/main/java/com/jeeplus/assess/reimbursement/reimbursementInfo/service/ReimbursementInfoService.java

@@ -946,10 +946,10 @@ public class ReimbursementInfoService {
             list.addAll(officeList);
         }*/
         //如果当前登录人是会计公司,则查询有资质的员工
-        if ("10003".equals(userDTO.getTenantDTO().getId())){
+        //if ("10003".equals(userDTO.getTenantDTO().getId())){
             List<TreeUserDto> certUserList = infoMapper.findCertUserList(name);
             treeUsers.addAll(certUserList);
-        }
+        //}
         // 查询用户
 //        List<TreeUserDto> userList = infoMapper.findUserList(name);
         //查询综合管理公司用户信息

jeeplus-modules/jeeplus-ccpm/pom.xml

@@ -79,11 +79,11 @@
             <artifactId>jeeplus-common-security</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-system-api</artifactId>
             <version>${project.parent.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-common-log</artifactId>
@@ -99,11 +99,11 @@
             <artifactId>jeeplus-public-modules</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>
@@ -131,7 +131,7 @@
         <!--            <artifactId>jeeplus-assess</artifactId>-->
         <!--            <version>${project.parent.version}</version>-->
         <!--        </dependency>-->
-        <dependency>
+        <!--<dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-finance</artifactId>
             <version>${project.parent.version}</version>
@@ -140,7 +140,7 @@
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-system</artifactId>
             <version>${project.parent.version}</version>
-        </dependency>
+        </dependency>-->
         <!--        <dependency>-->
         <!--            <groupId>org.jeeplus</groupId>-->
         <!--            <artifactId>jeeplus-flowable</artifactId>-->

jeeplus-modules/jeeplus-centrecareful/pom.xml

@@ -79,11 +79,11 @@
             <artifactId>jeeplus-common-security</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-system-api</artifactId>
             <version>${project.parent.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-common-log</artifactId>
@@ -99,11 +99,11 @@
             <artifactId>jeeplus-public-modules</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>
@@ -131,7 +131,7 @@
 <!--            <artifactId>jeeplus-assess</artifactId>-->
 <!--            <version>${project.parent.version}</version>-->
 <!--        </dependency>-->
-        <dependency>
+        <!--<dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-finance</artifactId>
             <version>${project.parent.version}</version>
@@ -140,7 +140,7 @@
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-system</artifactId>
             <version>${project.parent.version}</version>
-        </dependency>
+        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>org.jeeplus</groupId>-->
 <!--            <artifactId>jeeplus-flowable</artifactId>-->

jeeplus-modules/jeeplus-consult/pom.xml

@@ -79,11 +79,11 @@
             <artifactId>jeeplus-common-security</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-system-api</artifactId>
             <version>${project.parent.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-common-log</artifactId>
@@ -99,11 +99,11 @@
             <artifactId>jeeplus-public-modules</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-spring-boot-starter</artifactId>
@@ -131,7 +131,7 @@
         <!--            <artifactId>jeeplus-assess</artifactId>-->
         <!--            <version>${project.parent.version}</version>-->
         <!--        </dependency>-->
-        <dependency>
+        <!--<dependency>
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-finance</artifactId>
             <version>${project.parent.version}</version>
@@ -140,7 +140,7 @@
             <groupId>org.jeeplus</groupId>
             <artifactId>jeeplus-system</artifactId>
             <version>${project.parent.version}</version>
-        </dependency>
+        </dependency>-->
         <!--        <dependency>-->
         <!--            <groupId>org.jeeplus</groupId>-->
         <!--            <artifactId>jeeplus-flowable</artifactId>-->

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/controller/CwProjectReportSignatureCallBackController.java

@@ -296,6 +296,25 @@ public class CwProjectReportSignatureCallBackController {
 
             if(null != unZipFileList && unZipFileList.length>0){
                 for (File f : unZipFileList) {
+                    System.out.println(f.getName());
+                    String signatureFileName = f.getName();
+                    String temporaryFileName = f.getName();
+                    if(signatureFileName.contains("字(2") && signatureFileName.contains("苏兴会")){
+                        String targetSubstr = "字(2"; // 目标子字符串
+                        int indexLeft = signatureFileName.indexOf(targetSubstr)+1; // 获取目标子字符串的起始位置
+                        char newCharLeft = '['; // 要替换的新字符
+                        char newCharRight = ']'; // 要替换的新字符
+                        // 将指定下标处的字符替换为新字符
+                        temporaryFileName = temporaryFileName.substring(0, indexLeft) + newCharLeft + temporaryFileName.substring(indexLeft + 1);
+                        temporaryFileName = temporaryFileName.substring(0, indexLeft+5) + newCharRight + temporaryFileName.substring(indexLeft + 6);
+
+                        String filePath = f.getParent();
+                        File newFile = new File(filePath + File.separator + temporaryFileName);
+                        if (f.renameTo(newFile)) {
+                            f = newFile;
+                        }
+                    }
+
                     String filepath = "";
                     //取得上传文件
                     //将文件上传到oss云盘中

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -342,8 +342,12 @@ public class UserController {
                 }else{
                     info.setAccountantUserFlag(1);
                 }*/
-                Integer accountantUserCount = userService.getAccountantUserCount(info.getId());
-                info.setAccountantUserCount(accountantUserCount);
+                if("庞广新".equals(info.getName())){
+                    info.setAccountantUserCount(99);
+                }else{
+                    Integer accountantUserCount = userService.getAccountantUserCount(info.getId());
+                    info.setAccountantUserCount(accountantUserCount);
+                }
             }
         }
         return ResponseEntity.ok ( result );