20230328 18:28

ruoyi-anpin/src/main/java/com/ruoyi/anpin/service/impl/TContractManagementServiceImpl.java

@@ -65,6 +65,7 @@ public class TContractManagementServiceImpl implements ITContractManagementServi
         // 查询附件表数据
         TEnclosure enclosure = new TEnclosure();
         enclosure.setfPid(fId);
+        enclosure.setfMainType("ContractManagement");
         List<TEnclosure> enclosures = tEnclosureMapper.selectTEnclosureList(enclosure);
 
         map.put("tEnclosure", enclosures);
@@ -140,10 +141,12 @@ public class TContractManagementServiceImpl implements ITContractManagementServi
                     enclosure.setfLineno(lineNo);
                     enclosure.setCreateTime(new Date());
                     enclosure.setCreateBy(loginUser.getUser().getUserName());
+                    enclosure.setfMainType("ContractManagement");
                     tEnclosureMapper.insertTEnclosure(enclosure);
                 } else {
                     enclosure.setUpdateBy(loginUser.getUser().getUserName());
                     enclosure.setUpdateTime(new Date());
+                    enclosure.setfMainType("ContractManagement");
                     tEnclosureMapper.updateTEnclosure(enclosure);
                 }
             }

ruoyi-anpin/src/main/java/com/ruoyi/anpin/service/impl/TCostManagementServiceImpl.java

@@ -84,6 +84,7 @@ public class TCostManagementServiceImpl implements ITCostManagementService
         // 查询附件表数据
         TEnclosure enclosure = new TEnclosure();
         enclosure.setfPid(fId);
+        enclosure.setfMainType("CostManagement");
         List<TEnclosure> enclosures = tEnclosureMapper.selectTEnclosureList(enclosure);
 
         map.put("tEnclosure", enclosures);
@@ -174,10 +175,12 @@ public class TCostManagementServiceImpl implements ITCostManagementService
                     enclosure.setfLineno(lineNo);
                     enclosure.setCreateTime(new Date());
                     enclosure.setCreateBy(loginUser.getUser().getUserName());
+                    enclosure.setfMainType("CostManagement");
                     tEnclosureMapper.insertTEnclosure(enclosure);
                 } else {
                     enclosure.setUpdateBy(loginUser.getUser().getUserName());
                     enclosure.setUpdateTime(new Date());
+                    enclosure.setfMainType("CostManagement");
                     tEnclosureMapper.updateTEnclosure(enclosure);
                 }
             }

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -28,7 +28,7 @@ public class BaseEntity implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**