Merge remote-tracking branch 'origin/master'

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/service/dto/UserDTO.java

@@ -164,7 +164,7 @@ public class UserDTO extends BaseDTO implements Serializable {
     /**
      * 手机
      */
-    @Length(min = 1, max = 100)
+    //@Length(min = 1, max = 100)
     @ExcelProperty("手机")
     private String mobile;
 

jeeplus-modules/jeeplus-admin-server/src/main/resources/logback.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="true" scanPeriod="1 seconds">
+
+    <contextName>logback</contextName>
+    <property name="log.path" value="/mnt/project/cloud/logs/couldLogs/adminServer-log.log"/>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.zip</fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="ERROR">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file"/>
+    </root>
+
+</configuration>

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/controller/ZsReportArchieveController.java

@@ -119,6 +119,9 @@ public class ZsReportArchieveController {
             String number = (item).getNumber();
             return number != null && number.contains("例");
         });
+        if(listA.isEmpty()){
+            return ResponseEntity.badRequest().body("导入数据为空，导入失败！如导入表格中存在示例行，请将示例行进行删除");
+        }
         //导入前检测数据
         String resultA = reportArchieveService.importDecide(listA, arrayList);
         if(StringUtils.isNotBlank(resultA)){

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/service/ZsReportArchieveService.java

@@ -320,46 +320,48 @@ public class ZsReportArchieveService {
             String documentNo = SpringUtil.getBean ( IWorkAttachmentApi.class ).genSerialNum(officeDTO.getId(), ZsReportArchieve.BIZ_CODE,currentToken);
             zsReportArchieve.setArchieveNo(documentNo);
             //存放地点
-            String place = reportArchieveDTO.getStoragePlace().replace(" ", "");
-            if (place.contains("江苏分所") && place.contains("区")){
-                String substring = place.substring(place.lastIndexOf("所") + 1, place.lastIndexOf("区"));
-                String placeValue = "";
-                //可能会存在多个区
-                if (substring.contains("区")){
-                    String[] split = substring.split("区");
-                    StringBuilder vaBuilder = new StringBuilder();
-                    for (String s : split) {
-                        String value = "";
-                        if (StringUtils.isNotBlank(s)){
-                            for (String key : storagePlaceValueDTOs.keySet()) {
-                                if(s.equals(key)){
-                                    value = String.valueOf(storagePlaceValueDTOs.get(key));
-                                    break;
+            if(StringUtils.isNotBlank(reportArchieveDTO.getStoragePlace())){
+                String place = reportArchieveDTO.getStoragePlace().replace(" ", "");
+                if (place.contains("江苏分所") && place.contains("区")){
+                    String substring = place.substring(place.lastIndexOf("所") + 1, place.lastIndexOf("区"));
+                    String placeValue = "";
+                    //可能会存在多个区
+                    if (substring.contains("区")){
+                        String[] split = substring.split("区");
+                        StringBuilder vaBuilder = new StringBuilder();
+                        for (String s : split) {
+                            String value = "";
+                            if (StringUtils.isNotBlank(s)){
+                                for (String key : storagePlaceValueDTOs.keySet()) {
+                                    if(s.equals(key)){
+                                        value = String.valueOf(storagePlaceValueDTOs.get(key));
+                                        break;
+                                    }
                                 }
                             }
-                        }
-                        if (StringUtils.isNotBlank(value)) {
-                            if (vaBuilder.length() > 0) {
-                                vaBuilder.append(",");  // 用逗号分隔每个拼接的值
+                            if (StringUtils.isNotBlank(value)) {
+                                if (vaBuilder.length() > 0) {
+                                    vaBuilder.append(",");  // 用逗号分隔每个拼接的值
+                                }
+                                vaBuilder.append(value);  // 拼接 value
                             }
-                            vaBuilder.append(value);  // 拼接 value
                         }
-                    }
-                    placeValue = vaBuilder.toString();
-                }else {
-                    if (StringUtils.isNotBlank(substring)){
-                        for (String key : storagePlaceValueDTOs.keySet()) {
-                            if(substring.equals(key)){
-                                placeValue = String.valueOf(storagePlaceValueDTOs.get(key));
-                                break;
+                        placeValue = vaBuilder.toString();
+                    }else {
+                        if (StringUtils.isNotBlank(substring)){
+                            for (String key : storagePlaceValueDTOs.keySet()) {
+                                if(substring.equals(key)){
+                                    placeValue = String.valueOf(storagePlaceValueDTOs.get(key));
+                                    break;
+                                }
                             }
                         }
                     }
+                    zsReportArchieve.setStoragePlace(placeValue);
+                }else {
+                    zsReportArchieve.setSpecialPlace(place);
+                    zsReportArchieve.setStoragePlace("");
                 }
-                zsReportArchieve.setStoragePlace(placeValue);
-            }else {
-                zsReportArchieve.setSpecialPlace(place);
-                zsReportArchieve.setStoragePlace("");
             }
 
             //归档接收人

jeeplus-modules/jeeplus-centrecareful/src/main/java/com/jeeplus/centrecareful/reportArchieve/service/dto/ZsReportArchieveExport.java

@@ -14,7 +14,7 @@ public class ZsReportArchieveExport extends BaseEntity {
     @Excel(name = "序号",width = 10)
     private String number;
 
-    @Excel(name = "部门",width = 15)
+    @Excel(name = "*部门",width = 15)
     private String officeName;  //部门名称
 
     @Excel(name = "企业名称(审计报告上被审计单位名称)",width = 30)
@@ -26,7 +26,7 @@ public class ZsReportArchieveExport extends BaseEntity {
     @Excel(name = "项目",width = 35)
     private String project; //项目
 
-    @Excel(name = "报告文号",width = 20)
+    @Excel(name = "*报告文号",width = 20)
     private String reportNo;    //报告文号
 
     @Excel(name = "报告涵盖期间",width = 20)

jeeplus-modules/jeeplus-flowable/src/main/resources/logback.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="true" scanPeriod="1 seconds">
+
+    <contextName>logback</contextName>
+    <property name="log.path" value="/mnt/project/cloud/logs/couldLogs/flowable-log.log"/>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.zip</fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%date %level [%thread] %logger{36} [%file : %line] %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file"/>
+    </root>
+
+</configuration>