1、项目添加经营状态、是否为物业字段

2、签到添加项目id字段

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanAppController.java

@@ -953,8 +953,15 @@ public class RiskPlanAppController extends BaseController {
                 showDto.setFiles(uploadFileService.selectSysFileByFileIds(fileIds));
             }
             //人员
+            if (dto.getUserId() != null) {
                 SysUser sysUser = userService.selectUserById(dto.getUserId());
-            showDto.setUserName(sysUser.getNickName());
+                showDto.setUserName(sysUser != null ? sysUser.getNickName() : null);
+            }
+            //项目
+            if (dto.getProjectId() != null) {
+                LedgerProject ledgerProject = ledgerProjectService.selectLedgerProjectById(dto.getProjectId());
+                showDto.setProjectName(ledgerProject != null ? ledgerProject.getName() : null);
+            }
             return showDto;
         }).collect(Collectors.toList());
         dataTable.setRows(showDtos);

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerProject.java

@@ -51,6 +51,12 @@ public class LedgerProject extends BaseEntityClean
 
     /** 删除标志（0代表存在 1代表删除） */
     private String delFlag;
+
+    /** 经营状态 */
+    private String businessStatus;
+
+    /** 是否为物业 */
+    private Boolean propertyManagement;
     /**
      * 部门名称名称
      */

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskPlan.java

@@ -95,6 +95,18 @@ public class RiskPlan extends BaseEntityClean
     @TableField(exist = false)
     private String projectBusiness;
 
+    /**
+     * 经营状态
+     */
+    @TableField(exist = false)
+    private String businessStatus;
+
+    /**
+     * 是否为物业
+     */
+    @TableField(exist = false)
+    private Boolean propertyManagement;
+
     /**
      * 是否台账
      */

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/RiskSignRecord.java

@@ -28,6 +28,10 @@ public class RiskSignRecord extends BaseEntity
     @TableField("user_id")
     private Long userId;
 
+    /** 项目id */
+    @TableField("project_id")
+    private Long projectId;
+
     /** 文件ids */
     @TableField("file_ids")
     private String fileIds;

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskSignRecordAppShowDto.java

@@ -25,6 +25,12 @@ public class RiskSignRecordAppShowDto {
     /** 用户名称 */
     private String userName;
 
+    /** 项目id */
+    private Long projectId;
+
+    /** 项目名称 */
+    private String projectName;
+
     /** 文件ids */
     private String fileIds;
 

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -157,6 +157,8 @@ public class RiskPlanServiceImpl extends MPJBaseServiceImpl<RiskPlanMapper, Risk
         LedgerProject ledgerProject = new LedgerProject();
         ledgerProject.setId(riskPlan.getProjectId());
         ledgerProject.setBusiness(riskPlan.getProjectBusiness());
+        ledgerProject.setBusinessStatus(riskPlan.getBusinessStatus());
+        ledgerProject.setPropertyManagement(riskPlan.getPropertyManagement());
         ledgerProjectService.updateLedgerProject(ledgerProject);
         return i;
     }

censoft-rongtong/src/main/resources/mapper/system/LedgerProjectMapper.xml

@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="source"    column="source"    />
         <result property="status"    column="status"    />
         <result property="delFlag"    column="del_flag"    />
+        <result property="businessStatus"    column="business_status"    />
+        <result property="propertyManagement"    column="property_management"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -22,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLedgerProjectVo">
-        select id, name, type,business, dept_id, city, address, source, status, del_flag, create_by, create_time, update_by, update_time from ledger_project
+        select id, name, type,business, dept_id, city, address, source, status, del_flag, business_status, property_management, create_by, create_time, update_by, update_time from ledger_project
     </sql>
 
     <select id="selectLedgerProjectList" parameterType="com.censoft.censoftrongtong.domain.LedgerProject" resultMap="LedgerProjectResult">
@@ -98,6 +100,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="source != null">source,</if>
             <if test="status != null">status,</if>
             <if test="delFlag != null">del_flag,</if>
+            <if test="businessStatus != null">business_status,</if>
+            <if test="propertyManagement != null">property_management,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -113,6 +117,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="source != null">#{source},</if>
             <if test="status != null">#{status},</if>
             <if test="delFlag != null">#{delFlag},</if>
+            <if test="businessStatus != null">#{businessStatus},</if>
+            <if test="propertyManagement != null">#{propertyManagement},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -132,6 +138,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="source != null">source = #{source},</if>
             <if test="status != null">status = #{status},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="businessStatus != null">business_status = #{businessStatus},</if>
+            <if test="propertyManagement != null">property_management = #{propertyManagement},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>