Explorar el Código

feat(日志):用户操作日志

liutao hace 5 meses
padre
commit
92c741690c

+ 28 - 0
src/main/java/com/sunxung/factoring/entity/project/ProjectCoreEnterprise.java

@@ -88,6 +88,18 @@ public class ProjectCoreEnterprise extends Project{
     @TableField("errors_string")
     private String errorsString;
 
+    /**
+     *  是否流程授信 0 否 1 是
+     */
+    @TableField("process")
+    private Integer process;
+
+    /**
+     * 关联的核心企业授信ID
+     */
+    @TableField("old_core_enterprise_id")
+    private Long oldCoreEnterpriseId;
+
     /**
      *  状态
      */
@@ -331,6 +343,22 @@ public class ProjectCoreEnterprise extends Project{
         this.historicalCooperationTimes = historicalCooperationTimes;
     }
 
+    public Integer getProcess() {
+        return process;
+    }
+
+    public void setProcess(Integer process) {
+        this.process = process;
+    }
+
+    public Long getOldCoreEnterpriseId() {
+        return oldCoreEnterpriseId;
+    }
+
+    public void setOldCoreEnterpriseId(Long oldCoreEnterpriseId) {
+        this.oldCoreEnterpriseId = oldCoreEnterpriseId;
+    }
+
     @Override
     public String toString() {
         return "CProjectCoreEnterprise{" +

+ 5 - 1
src/main/java/com/sunxung/factoring/service/supplier/impl/SupplierInfoServiceImpl.java

@@ -431,7 +431,11 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
             Long id = processingLog.getAssignee().getId();
             if (id != null) {
                 User user = userService.get(id);
-                supplierInfo.setAssigneeName(user.getName());
+                if("admin".equals(user.getName())){
+                    supplierInfo.setAssigneeName("C端用户");
+                }else {
+                    supplierInfo.setAssigneeName(user.getName());
+                }
             }
             if (processingLog.getFormBusinessId() != null) {
                 supplierInfo.setAssigneeName("");

+ 1 - 1
src/main/resources/mapper/project/ProjectCoreEnterpriseMapper.xml

@@ -22,7 +22,7 @@
 	</select>
     <select id="findBySearch" resultType="com.sunxung.factoring.entity.project.ProjectCoreEnterprise">
 		select
-		    t1.id,
+			IFNULL(t1.old_core_enterprise_id,t1.id) id,
 			t2.business_number,
 			t2.project_name,
 			t3.corporate_name ownerName,