Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.3

project_data/sql/0.0.3/soc/soc.sql

@@ -1416,6 +1416,28 @@ ALTER TABLE `core_monitoring_task_registration`
 
 END IF;
 
+
+-- 安全责任书
+IF NOT EXISTS(SELECT *
+              FROM information_schema.columns
+              WHERE table_schema = DATABASE()
+                AND table_name = 'core_safety_book_hsggbsdj'
+                AND column_name = 'org_id') THEN
+    ALTER TABLE `core_safety_book_hsggbsdj`
+        ADD COLUMN `org_id` bigint NULL COMMENT '机构id';
+
+END IF;
+-- 安全责任书
+IF NOT EXISTS(SELECT *
+              FROM information_schema.columns
+              WHERE table_schema = DATABASE()
+                AND table_name = 'core_safety_book_hsggbsdj'
+                AND column_name = 'join_names') THEN
+    ALTER TABLE `core_safety_book_hsggbsdj`
+        ADD COLUMN `join_names` varchar(255) NULL COMMENT '参与人员';
+
+END IF;
+
 END ??
 DELIMITER;
 CALL schema_change ();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetybook/domain/CoreSafetyBookHsggbsdj.java

@@ -41,11 +41,16 @@ public class CoreSafetyBookHsggbsdj extends BaseEntity {
      */
     @ApiModelProperty(value = "工作主题")
     private String title;
-
+    @TableField(exist = false)
+    private String userNames;
+    @ApiModelProperty(value = "机构id")
+    private Long orgId;
+    @TableField(exist = false)
+    private String orgName;
     /**
      * 开会日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty(value = "开会日期")
     private Date date;
 
@@ -60,8 +65,8 @@ public class CoreSafetyBookHsggbsdj extends BaseEntity {
      */
     @ApiModelProperty(value = "照片")
     private String images;
-    @TableField(exist = false)
-    private String userNames;
+    @ApiModelProperty(value = "参会人员")
+    private String joinNames;
     @TableField(exist = false)
     private List<Long> userIds;
     @Override

soc-modules/soc-modules-core/src/main/resources/mapper/safetybook/CoreSafetyBookHsggbsdjMapper.xml

@@ -65,22 +65,26 @@
             h.create_by,
             h.update_by,
             h.images,
+               h.join_names,
+               o.name as org_name,
             group_concat( u.NAME ) AS userNames
         FROM
             core_safety_book_hsggbsdj h
                 LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
                 LEFT JOIN sys_user u ON u.id = hu.user_id
-        GROUP BY
-            h.id
+        left join sys_org o on o.id =h.org_id
+
         <where>
             <if test="hs.title != null  and hs.title != ''">
-                and title like concat(concat('%', #{hs.title}),'%')
+                and h.title like concat(concat('%', #{hs.title}),'%')
             </if>
             <if test="hs.date != null ">
                 and date = #{hs.date}
             </if>
 
         </where>
+        GROUP BY
+        h.id
     </select>
     <select id="selectHsggbsdjById" resultType="com.xunmei.core.safetybook.domain.CoreSafetyBookHsggbsdj">
         SELECT
@@ -93,11 +97,15 @@
         h.create_by,
         h.update_by,
         h.images,
+               h.join_names,
+        o.name as org_name,
+               h.org_id,
         group_concat( u.NAME ) AS userNames
         FROM
         core_safety_book_hsggbsdj h
         LEFT JOIN core_safety_book_hsggbsdj_user hu ON hu.hsggbsdj_id = h.id
         LEFT JOIN sys_user u ON u.id = hu.user_id
+        left join sys_org o on o.id =h.org_id
         where h.id=#{id}
         GROUP BY
         h.id,h.create_time