完善安全检查记录

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionAttach.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.housingconstruction.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -19,7 +20,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 @EqualsAndHashCode(callSuper = true)
 @AllArgsConstructor
 @NoArgsConstructor
-public class CenterdataTHousingconstructionAttach extends BaseEntity {
+public class CenterdataTHousingconstructionAttach extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -64,16 +65,6 @@ public class CenterdataTHousingconstructionAttach extends BaseEntity {
     private Long attachSorts;
 
     /**
-     * 创建人
-     */
-    private String createName;
-
-    /**
-     * 更新人
-     */
-    private String updateName;
-
-    /**
      * 部门id
      */
     private Long deptId;

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionEnterprise.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.housingconstruction.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -18,7 +19,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CenterdataTHousingconstructionEnterprise extends BaseEntity {
+public class CenterdataTHousingconstructionEnterprise extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -100,16 +101,6 @@ public class CenterdataTHousingconstructionEnterprise extends BaseEntity {
     private String latitude;
 
     /**
-     * 创建人
-     */
-    private String createName;
-
-    /**
-     * 修改人
-     */
-    private String updateName;
-
-    /**
      * 所属部门
      */
     private Long deptId;

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionRealnameuser.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.housingconstruction.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -18,7 +19,7 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CenterdataTHousingconstructionRealnameuser extends BaseEntity {
+public class CenterdataTHousingconstructionRealnameuser extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -88,16 +89,6 @@ public class CenterdataTHousingconstructionRealnameuser extends BaseEntity {
     private String latitude;
 
     /**
-     * 创建人
-     */
-    private String createName;
-
-    /**
-     * 修改人
-     */
-    private String updateName;
-
-    /**
      * 所属部门
      */
     @Excel(name = "所属部门")

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSafetyinspectionitem.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.housingconstruction.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -15,7 +16,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CenterdataTHousingconstructionSafetyinspectionitem extends BaseEntity {
+public class CenterdataTHousingconstructionSafetyinspectionitem extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -42,16 +43,6 @@ public class CenterdataTHousingconstructionSafetyinspectionitem extends BaseEnti
     private Integer inspectionSort;
 
     /**
-     * 创建人
-     */
-    private String createName;
-
-    /**
-     * 修改人
-     */
-    private String updateName;
-
-    /**
      * 所属部门
      */
     private Long deptId;

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSafetyinspectionrecords.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.housingconstruction.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CenterdataTHousingconstructionSafetyinspectionrecords extends BaseEntity {
+public class CenterdataTHousingconstructionSafetyinspectionrecords extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSafetyinspectionrecordsdetail.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.housingconstruction.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class CenterdataTHousingconstructionSafetyinspectionrecordsdetail extends BaseEntity {
+public class CenterdataTHousingconstructionSafetyinspectionrecordsdetail extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -56,16 +57,6 @@ public class CenterdataTHousingconstructionSafetyinspectionrecordsdetail extends
     private String standardStatus;
 
     /**
-     * 创建人
-     */
-    private String createName;
-
-    /**
-     * 修改人
-     */
-    private String updateName;
-
-    /**
      * 所属部门
      */
     private Long deptId;
@@ -75,8 +66,6 @@ public class CenterdataTHousingconstructionSafetyinspectionrecordsdetail extends
      */
     private String deptName;
 
-
-
     private String remark;
 
     private List<CenterdataTHousingconstructionAttach> attachList;

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionEnterpriseServiceImpl.java

@@ -68,7 +68,7 @@ public class CenterdataTHousingconstructionEnterpriseServiceImpl implements ICen
     @Override
     public int updateCenterdataTHousingconstructionEnterprise(CenterdataTHousingconstructionEnterprise centerdataTHousingconstructionEnterprise) {
         centerdataTHousingconstructionEnterprise.setUpdateTime(DateUtils.getNowDate());
-        centerdataTHousingconstructionEnterprise.setUpdateBy(SecurityUtils.getUserId().toString());
+        centerdataTHousingconstructionEnterprise.setUpdateBy(SecurityUtils.getUserId());
         centerdataTHousingconstructionEnterprise.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTHousingconstructionEnterpriseMapper.updateCenterdataTHousingconstructionEnterprise(centerdataTHousingconstructionEnterprise);
     }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionRealnameuserServiceImpl.java

@@ -66,7 +66,7 @@ public class CenterdataTHousingconstructionRealnameuserServiceImpl implements IC
     @Override
     public int updateCenterdataTHousingconstructionRealnameuser(CenterdataTHousingconstructionRealnameuser centerdataTHousingconstructionRealnameuser) {
         centerdataTHousingconstructionRealnameuser.setUpdateTime(DateUtils.getNowDate());
-        centerdataTHousingconstructionRealnameuser.setUpdateBy(SecurityUtils.getUserId().toString());
+        centerdataTHousingconstructionRealnameuser.setUpdateBy(SecurityUtils.getUserId());
         centerdataTHousingconstructionRealnameuser.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTHousingconstructionRealnameuserMapper.updateCenterdataTHousingconstructionRealnameuser(centerdataTHousingconstructionRealnameuser);
     }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionSafetyinspectionitemServiceImpl.java

@@ -68,7 +68,7 @@ public class CenterdataTHousingconstructionSafetyinspectionitemServiceImpl imple
     @Override
     public int updateCenterdataTHousingconstructionSafetyinspectionitem(CenterdataTHousingconstructionSafetyinspectionitem centerdataTHousingconstructionSafetyinspectionitem) {
         centerdataTHousingconstructionSafetyinspectionitem.setUpdateTime(DateUtils.getNowDate());
-        centerdataTHousingconstructionSafetyinspectionitem.setUpdateBy(SecurityUtils.getUserId().toString());
+        centerdataTHousingconstructionSafetyinspectionitem.setUpdateBy(SecurityUtils.getUserId());
         centerdataTHousingconstructionSafetyinspectionitem.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         return centerdataTHousingconstructionSafetyinspectionitemMapper.updateCenterdataTHousingconstructionSafetyinspectionitem(centerdataTHousingconstructionSafetyinspectionitem);
     }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionSafetyinspectionrecordsServiceImpl.java

@@ -139,7 +139,7 @@ public class CenterdataTHousingconstructionSafetyinspectionrecordsServiceImpl im
     public int updateCenterdataTHousingconstructionSafetyinspectionrecords(CenterdataTHousingconstructionSafetyinspectionrecords centerdataTHousingconstructionSafetyinspectionrecords) {
         //设置修改数据信息
         centerdataTHousingconstructionSafetyinspectionrecords.setUpdateTime(DateUtils.getNowDate());
-        centerdataTHousingconstructionSafetyinspectionrecords.setUpdateBy(SecurityUtils.getUserId().toString());
+        centerdataTHousingconstructionSafetyinspectionrecords.setUpdateBy(SecurityUtils.getUserId());
         centerdataTHousingconstructionSafetyinspectionrecords.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         //获取旧数据
         CenterdataTHousingconstructionSafetyinspectionrecords oldRecords = recordsMapper.queryRedordDetails(centerdataTHousingconstructionSafetyinspectionrecords.getId());
@@ -182,7 +182,7 @@ public class CenterdataTHousingconstructionSafetyinspectionrecordsServiceImpl im
      */
     private void updateDetail(CenterdataTHousingconstructionSafetyinspectionrecordsdetail detail) {
         detail.setUpdateTime(DateUtils.getNowDate());
-        detail.setUpdateBy(SecurityUtils.getUserId().toString());
+        detail.setUpdateBy(SecurityUtils.getUserId());
         detail.setUpdateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
         detailMapper.updateCenterdataTHousingconstructionSafetyinspectionrecordsdetail(detail);
     }

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionSafetyinspectionrecordsMapper.xml

@@ -157,6 +157,7 @@
             <result property="inspectionName" column="inspection_name"/>
             <result property="inspectionSort" column="inspection_sort"/>
             <result property="standardStatus" column="standard_status"/>
+            <result property="remark" column="remark"/>
             <result property="createTime" column="detail_create_time"/>
             <result property="createBy" column="detail_create_by"/>
             <result property="createName" column="detail_create_name"/>

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionSafetyinspectionrecordsdetailMapper.xml

@@ -73,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="recordId != null">record_id = #{recordId},</if>
             <if test="itemId != null">item_id = #{itemId},</if>
             <if test="standardStatus != null">standard_status = #{standardStatus},</if>
+            <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createName != null">create_name = #{createName},</if>
@@ -98,14 +99,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <insert id="insertList" parameterType="list">
         insert into centerdata_t_housingconstruction_safetyinspectionrecordsdetail
-        (id, record_id, item_id, standard_status, item_sort, remark, create_time, create_by, create_name, update_time, update_by, update_name, dept_id, dept_name)
+        (id, record_id, item_id, standard_status, remark, create_time, create_by, create_name, update_time, update_by, update_name, dept_id, dept_name)
         values
         <foreach collection="list" item="detail" open="(" separator="),(" close=")">
             #{detail.id},
             #{detail.recordId},
             #{detail.itemId},
             #{detail.standardStatus},
-            #{detail.itemSort},
             #{detail.remark},
             #{detail.createTime},
             #{detail.createBy},