Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/Collect/Controller/CollectController.java

@@ -1980,7 +1980,7 @@ public class CollectController extends Controller {
         for (Map.Entry<String, Object> entry : jo.entrySet()) {
             String key = entry.getKey();
             int data_type_id = _map.get(key);
-            String value=entry.getValue().toString();
+            String value = entry.getValue().toString();
             switch (data_type_id) {
                 case 0:
                     continue;
@@ -1996,7 +1996,7 @@ public class CollectController extends Controller {
                     }
                     break;
                 case 3://小数
-                    if(!CommonUtil.isDecimal(value)){
+                    if (!CommonUtil.isDecimal(value)) {
                         Map<String, Object> map = new HashMap<>();
                         map.put("success", false);
                         map.put("message", _mapLabel.get(key) + "中输入的数据与要求的小数格式不一致，请重新输入！");
@@ -2005,7 +2005,7 @@ public class CollectController extends Controller {
                     }
                     break;
                 case 4: //日期
-                    if(!CommonUtil.isDate(value)){
+                    if (!CommonUtil.isDate(value)) {
                         Map<String, Object> map = new HashMap<>();
                         map.put("success", false);
                         map.put("message", _mapLabel.get(key) + "中输入的数据与要求的日期格式不一致，请重新输入！");

src/main/java/com/dsideal/QingLong/Collect/Model/CollectModel.java

@@ -390,8 +390,8 @@ public class CollectModel {
         finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"area_name\" IS '县区名称';\n";
         finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"bureau_id\" IS '单位ID';\n";
         finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"bureau_name\" IS '单位名称';\n";
-        finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"person_id\" IS '上传人员ID';\n";
-        finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"person_id\" IS '上传人员姓名';\n";
+        finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"person_id\" IS '上报人员ID';\n";
+        finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"person_id\" IS '上报人员姓名';\n";
         finalSql += "COMMENT ON COLUMN \"public\".\"" + table_name + "\".\"job_id\" IS '任务ID';\n";
         finalSql += commentSql;
         finalSql += "COMMENT ON TABLE \"public\".\"" + table_name + "\" IS '" + sheetName + "';";