oyq28 1 год назад
Родитель
Сommit
292ba1ee01

+ 1 - 1
src/main/java/com/imcs/admin/db/service/JdbcService.java

@@ -36,5 +36,5 @@ public interface JdbcService extends JdbcDao{
      */
     boolean ownerEnterprise(String tableName, Long id, Long userEnterpriseId);
 
-    void apply(Long id,String tableName,Long status);
+    void apply(Long id,String tableName,Long status,String field);
 }

+ 2 - 2
src/main/java/com/imcs/admin/db/service/impl/MysqlJdbcServiceImpl.java

@@ -347,12 +347,12 @@ public class MysqlJdbcServiceImpl extends MysqlJdbcDaoImpl implements JdbcServic
     }
 
     @Override
-    public void apply(Long id, String tableName,Long status) {
+    public void apply(Long id, String tableName,Long status,String field) {
         if(id == null || StrUtil.isBlank(tableName)){
             return;
         }
         Map<String, Object> beforeObj = getById(tableName, id);
-        super.update("审批",StrUtil.format("update {} set apply_status = {} where id = ? ",tableName,status),id);
+        super.update("审批",StrUtil.format("update {} set "+field+" = {} where id = ? ",tableName,status),id);
         logService.log(beforeObj,null,tableName);
     }
 

+ 20 - 7
src/main/java/com/imcs/admin/page/controller/CommonController.java

@@ -30,10 +30,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @RestController
 @RequestMapping("/admin/common")
@@ -56,6 +55,7 @@ public class CommonController {
     private GenerateSerial generateSerial;
 
 
+
     @PostMapping("/{formCode}/saveJson")
     public Result saveJson(@RequestBody Map<String, Object> obj, @PathVariable("formCode") String formCode) {
         String json = (String) obj.get("json");
@@ -223,7 +223,20 @@ public class CommonController {
                 return result;
             }
         }
+        //-----------------------
+        //更新文件类型
+        if(obj.containsKey("contractFile") && !Objects.isNull(obj.get("contractFile"))){
+            String contractFile = obj.get("contractFile").toString();
+            String businessType = obj.get("businessType").toString();
+            Pattern pattern = Pattern.compile("/([^/]+)/[^/]+\\.(\\w+)");
+            Matcher matcher = pattern.matcher(contractFile);
+            if (matcher.find()) {
+                String extractedString = matcher.group(1);
+                jdbcService.update("更新","update sys_file set business_type = ? where id = ? ",businessType,extractedString);
+            }
+        }
 
+        //-----------------------
         final Map<String,Object> dbObj = obj;
         try{
             jdbcService.transactionOption(()->{
@@ -619,8 +632,8 @@ public class CommonController {
         return result;
     }
 
-    @RequestMapping("/{model}/apply/{id}/{status}")
-    public Result apply(@PathVariable("id") Long id, @PathVariable("model") String model,@PathVariable("status") Long status) {
+    @RequestMapping("/{model}/apply/{id}/{field}/{status}")
+    public Result apply(@PathVariable("id") Long id, @PathVariable("model") String model,@PathVariable("status") Long status,@PathVariable("field") String field) {
         String tableName = StringUtil.toSqlColumn(model);
         Long enterpriseId = SessionContext.getSession().getEnterpriseId();
 
@@ -628,7 +641,7 @@ public class CommonController {
             return Result.error("没有数据权限.");
         }
 
-        jdbcService.apply(id,tableName,status);
+        jdbcService.apply(id,tableName,status,field);
 
         return Result.success();
     }