Merge remote-tracking branch 'origin/matser' into matser

ibps-model-root/modules/msg-model/src/main/java/com/lc/ibps/common/msg/persistence/entity/InnerMessageTbl.java

@@ -56,6 +56,13 @@ public class InnerMessageTbl extends AbstractPo<String>{
 	@ApiModelProperty(value = "消息跳转类型")
 	protected String skipTypeMsg; /*消息跳转类型*/
 
+	@ApiModelProperty(value = "外键")
+	protected String waiJian; /*外键*/
+
+	public String getWaiJian() { return waiJian; }
+
+	public void setWaiJian(String waiJian) { this.waiJian = waiJian; }
+
 	public String getSkipTypeMsg() {
 		return skipTypeMsg;
 	}

ibps-model-root/modules/msg-model/src/main/resources/com/lc/ibps/msg/persistence/mapping/InnerMessage.map.xml

@@ -18,16 +18,17 @@
 		<result property="tableName" column="TABLE_NAME_" jdbcType="VARCHAR"/>
 		<result property="taskId" column="TASK_ID_" jdbcType="VARCHAR"/>
 		<result property="skipTypeMsg" column="SKIP_TYPE_MSG" jdbcType="BLOB"/>
+		<result property="waiJian" column="WAI_JIAN_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<insert id="create" parameterType="com.lc.ibps.common.msg.persistence.entity.InnerMessagePo">
 		INSERT INTO IBPS_MSG_INNER
-		(ID_,SUBJECT_,OWNER_ID_,OWNER_,MESSAGE_TYPE_,CREATE_TIME_,CANREPLY_,IS_PUBLIC_,CONTENT_,FILE_MSG_,TENANT_ID_,TABLE_ID_,TABLE_NAME_,TASK_ID_,SKIP_TYPE_MSG)
+		(ID_,SUBJECT_,OWNER_ID_,OWNER_,MESSAGE_TYPE_,CREATE_TIME_,CANREPLY_,IS_PUBLIC_,CONTENT_,FILE_MSG_,TENANT_ID_,TABLE_ID_,TABLE_NAME_,TASK_ID_,SKIP_TYPE_MSG,WAI_JIAN_)
 		VALUES 
 		(#{id,jdbcType=VARCHAR}, #{subject,jdbcType=VARCHAR}, #{ownerId,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR},
 		#{messageType,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{canreply,jdbcType=NUMERIC}, #{isPublic,jdbcType=NUMERIC},
 		 #{content,jdbcType=CLOB}, #{fileMsg,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR},
-		 #{tableName,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR},#{skipTypeMsg,jdbcType=CLOB})
+		 #{tableName,jdbcType=VARCHAR}, #{taskId,jdbcType=VARCHAR},#{skipTypeMsg,jdbcType=CLOB}, #{waiJian,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get"   parameterType="java.lang.String" resultMap="InnerMessage">

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/StatisticServiceImpl.java

@@ -1217,7 +1217,22 @@ public class StatisticServiceImpl implements StatisticService {
                 "WHERE guan_lian_id_ IN (SELECT id_ FROM t_rypxcjb " +
                 "WHERE shi_fou_guo_shen_ = '已结束' %s) " +
                 "GROUP BY guan_lian_id_, ren_yuan_id_) AS re";
-
+        String ve = "";
+        try {
+            ve = settingUtil.getPx();
+        }catch (Exception e){
+            logger.warn("json转换异常");
+        }
+        if(BeanUtils.isNotEmpty(ve) && "1".equals(ve)){
+            countSqlTemplate = countSqlTemplate.replace("t_rypxcjb","t_lhrypxjlb").
+                    replace("shi_fou_guo_shen_","pei_xun_zhuang_ta");
+            signSqlTemplate = signSqlTemplate.replace("t_rypxcjb","t_lhrypxjlb").
+                    replace("shi_fou_guo_shen_","pei_xun_zhuang_ta");
+            sumRealSqlTemplate = sumRealSqlTemplate.replace("t_rypxcjb","t_lhrypxjlb").
+                    replace("shi_fou_guo_shen_","pei_xun_zhuang_ta");
+        }else{
+            logger.warn("StatisticServiceImpl.getYmdData 旧版本");
+        }
         for (String date : dateStr) {
             TraineeStatisticsDto traineeDto = new TraineeStatisticsDto();
 

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/UpdateDataTableMapper.xml

@@ -876,7 +876,12 @@
         <where>
             parent_id_ = ( SELECT id_ FROM t_jyrykhpzb WHERE bian_zhi_bu_men_ = #{map.bianZhiBuMen} ORDER BY create_time_ DESC LIMIT 1 )
             <if test="@o.Ognl@isNotEmpty(map.gangWei)">
-                AND (FIND_IN_SET(gang_wei_, #{map.gangWei}) OR (gang_wei_ IS NULL OR gang_wei_ = ''))
+                AND (
+                <!-- 将逗号分隔的字符串拆分成多个LIKE条件 -->
+                <foreach collection="map.gangWei.split(',')" item="item" index="index" open="(" close=")" separator=" OR ">
+                    gang_wei_ LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+                )
             </if>
             <if test="@o.Ognl@isEmpty(map.gangWei)">
                 AND (gang_wei_ IS NULL OR gang_wei_ = '')
@@ -892,7 +897,12 @@
         <where>
             parent_id_ = ( SELECT id_ FROM t_jyrykhpzb WHERE bian_zhi_bu_men_ = #{map.bianZhiBuMen} ORDER BY create_time_ DESC LIMIT 1 )
             <if test="@o.Ognl@isNotEmpty(map.gangWei)">
-                AND (FIND_IN_SET(gang_wei_, #{map.gangWei}) OR (gang_wei_ IS NULL OR gang_wei_ = ''))
+                AND (
+                <!-- 将逗号分隔的字符串拆分成多个LIKE条件 -->
+                <foreach collection="map.gangWei.split(',')" item="item" index="index" open="(" close=")" separator=" OR ">
+                    gang_wei_ LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+                )
             </if>
             <if test="@o.Ognl@isEmpty(map.gangWei)">
                 AND (gang_wei_ IS NULL OR gang_wei_ = '')

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/enumeration/FileEnumeration.java

@@ -7,21 +7,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum FileEnumeration {
     //内部文件
-    NEI_BU_WEN_JIAN("FILE_TYPE","内部文件","nbwj","1","286814138233389367","1","Y","0","-999", JSONUtil.parseObj("{\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    NEI_BU_WEN_JIAN("FILE_TYPE","内部文件","nbwj","1","286814138233389367","1","Y","0","-999", JSONUtil.parseObj("{\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //质量手册
     ZHI_LIANG_SHOU_CE("FILE_TYPE","质量手册","zlsc","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //程序文件
     CHENG_XU_WEN_JIAN("FILE_TYPE","程序文件","cxwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //安全手册
-    AN_QUAN_SHOU_CE("FILE_TYPE","安全手册","aqsc","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    AN_QUAN_SHOU_CE("FILE_TYPE","安全手册","aqsc","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //临床样品采集手册
     LING_CHUANG_YANG_PING_CAI_JI_SHOU_CE("FILE_TYPE","临床样品采集手册","lcypcjsc","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //信息系统文件
-    XIN_XI_XI_TONG_WEN_JIAN("FILE_TYPE","信息系统文件","xxxtwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    XIN_XI_XI_TONG_WEN_JIAN("FILE_TYPE","信息系统文件","xxxtwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //科室制度文件
-    KE_SHI_ZHI_DU_WEN_JIAN("FILE_TYPE","科室制度文件","kszdwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    KE_SHI_ZHI_DU_WEN_JIAN("FILE_TYPE","科室制度文件","kszdwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //记录表单
-    JI_LU_BIAO_DAN("FILE_TYPE","记录表单","jlbd","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspbgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    JI_LU_BIAO_DAN("FILE_TYPE","记录表单","jlbd","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspbgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //项目类sop
     N_XIANG_MU_LEI_SOP ("FILE_TYPE","项目类sop","xmlSOP","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //管理类sop
@@ -29,39 +29,39 @@ public enum FileEnumeration {
     //设备类sop
     N_SHE_BEI_LEI_SOP("FILE_TYPE","设备类sop","sblSOP","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //受限类
-    N_SHOU_XIAN_LEI("FILE_TYPE","受限类","sxl","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"受限查阅\"}")),
+    N_SHOU_XIAN_LEI("FILE_TYPE","受限类","sxl","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"受限查阅\"}")),
     //外部文件
-    WAI_BU_WEN_JIAN("FILE_TYPE","外部文件","wbwj","1","286814138233389367","1","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    WAI_BU_WEN_JIAN("FILE_TYPE","外部文件","wbwj","1","286814138233389367","1","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //国家标准
-    GUO_JIA_BIAO_ZHUN("FILE_TYPE","国家标准","gjbz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    GUO_JIA_BIAO_ZHUN("FILE_TYPE","国家标准","gjbz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //卫生行业标准
-    WEI_SHENG_HANG_YE_BIAO_ZHUN("FILE_TYPE","卫生行业标准","wsxybz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    WEI_SHENG_HANG_YE_BIAO_ZHUN("FILE_TYPE","卫生行业标准","wsxybz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //技术标准
-    JI_SHU_BIAO_ZHUN("FILE_TYPE","技术标准","jsbz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    JI_SHU_BIAO_ZHUN("FILE_TYPE","技术标准","jsbz","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //安全管理文件
-    AN_QUAN_GUAN_LI_WEN_JIAN("FILE_TYPE","安全管理文件","aqglwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    AN_QUAN_GUAN_LI_WEN_JIAN("FILE_TYPE","安全管理文件","aqglwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //认可规范及指南
-    REN_KE_GUI_FAN_JI_ZHINAN("FILE_TYPE","认可规范及指南","rkwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    REN_KE_GUI_FAN_JI_ZHINAN("FILE_TYPE","认可规范及指南","rkwj","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //法律法规
-    FA_LU_FA_GUI("FILE_TYPE","法律法规","flfg","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    FA_LU_FA_GUI("FILE_TYPE","法律法规","flfg","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //其他
-    QITA("FILE_TYPE","其他","qt","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
+    QITA("FILE_TYPE","其他","qt","1","","2","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}")),
     //设备使用说明
-    W_SHE_BEI_SHI_YONG_SHUO_MING_SHU("FILE_TYPE","设备使用说明","sbsysms","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
+    W_SHE_BEI_SHI_YONG_SHUO_MING_SHU("FILE_TYPE","设备使用说明","sbsysms","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //试剂使用说明书
-    W_SHI_JI_SHI_YONG_SHUO_MING_SHU("FILE_TYPE","试剂使用说明书","sjsysms","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
+    W_SHI_JI_SHI_YONG_SHUO_MING_SHU("FILE_TYPE","试剂使用说明书","sjsysms","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //法律法规
-    W_FA_LU_FAG_UI("FILE_TYPE","法律法规","flfg","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
+    W_FA_LU_FAG_UI("FILE_TYPE","法律法规","flfg","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}")),
     //行业标准
-    W_HANG_YE_BIAO_ZHUN("FILE_TYPE","行业标准","xybz","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
+    W_HANG_YE_BIAO_ZHUN("FILE_TYPE","行业标准","xybz","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
     //参考文献
-    W_CAN_KAO_WEN_XIAN("FILE_TYPE","参考文献","ckwx","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
+    W_CAN_KAO_WEN_XIAN("FILE_TYPE","参考文献","ckwx","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
     //书籍
-    W_SHU_JI("FILE_TYPE","书籍","sj","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
+    W_SHU_JI("FILE_TYPE","书籍","sj","1","","3","Y","0","-999",JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
     //其他
-    W_QI_TA ("FILE_TYPE","其他","qt","1","","3","Y","0","-999",JSONUtil.parseObj("{\"buMen\":\"\",\"shenCha\":\"不需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
+    W_QI_TA ("FILE_TYPE","其他","qt","1","","3","Y","0","-999",JSONUtil.parseObj("{\"buMen\":\"\",\"shenCha\":\"需要\",\"chaYue\":\"部门查阅\",\"diDian\":\"\"}")),
     //受限类
-    W_SHOU_XIAN_LIE("FILE_TYPE","受限类","sxl","1","","3","Y","0","-999",JSONUtil.parseObj("{\"buMen\":\"\",\"shenCha\":\"不需要\",\"chaYue\":\"受限查阅\",\"diDian\":\"\"}"));
+    W_SHOU_XIAN_LIE("FILE_TYPE","受限类","sxl","1","","3","Y","0","-999",JSONUtil.parseObj("{\"buMen\":\"\",\"shenCha\":\"需要\",\"chaYue\":\"受限查阅\",\"diDian\":\"\"}"));
 
     public String categoryKey;
     public String name;

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/plan/job/InitializeFolderJob.java

@@ -182,10 +182,10 @@ public class InitializeFolderJob extends BaseJob2 {
     public List<Map<String, Object>> assemblyData(List<Map<String, Object>> deptList,String neiId,String neiFu ,String waiId,String waiFu,String diDian) throws Exception{
         List<Map<String, Object>> list = new ArrayList<>();
         if(Collections.isNotEmpty(deptList)){
-            JSONObject neiAuthName = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}"));
+            JSONObject neiAuthName = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}"));
             JSONObject waiAuthName = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"fenLei\":\"通用\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}"));
 
-            JSONObject neiAuthNameForu = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"不需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}"));
+            JSONObject neiAuthNameForu = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"jspgz\",\"buMen\":[[]],\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"部门查阅\"}"));
             JSONObject waiAuthNameFour = new JSONObject(JSONUtil.parseObj("{\"shenHeZouXiang\":\"shspgz\",\"fenLei\":\"通用\",\"buMen\":\"\",\"shenCha\":\"需要\",\"diDian\":\"\",\"chaYue\":\"公用查阅\"}"));
 
             for (Map<String, Object> item : deptList ) {

ibps-provider-root/modules/provider-platform/src/main/java/com/lc/ibps/platform/service/PatchService.java

@@ -127,12 +127,44 @@ public class PatchService {
                 TkID1 = po.getTaskId();
             }
         }
-        for (BpmApprovePo po :approvals) {
-            commonDao.execute("update ibps_bpm_approval_his set COMPLETE_TIME_=#{p0},CREATE_TIME_=#{p1} where id_=#{p2}",
-                    new Object[]{po.getCompleteTime(),po.getCompleteTime(),po.getId()});
+      /*  for (BpmApprovePo po :approvals) {
+            commonDao.execute("update ibps_bpm_approval_his set COMPLETE_TIME_=#{p0},CREATE_TIME_=#{p1},OPINION_=#{p3} where id_=#{p2}",
+                    new Object[]{po.getCompleteTime(),po.getCompleteTime(),po.getId(),po.getOpinion()});
             if(StringUtils.isNotEmpty(po.getTaskKey())) {
-                commonDao.execute("update ibps_bpm_oper_log set CREATE_TIME_=#{p0} where proc_inst_id_=#{p1} and node_id_=#{p2}",
-                        new Object[]{po.getCompleteTime(), po.getProcInstId(), po.getTaskKey()});
+                commonDao.execute("update ibps_bpm_oper_log set CREATE_TIME_=#{p0},OPTION_=#{p3} where proc_inst_id_=#{p1} and node_id_=#{p2}",
+                        new Object[]{po.getCompleteTime(), po.getProcInstId(), po.getTaskKey(),po.getOpinion()});
+            }
+        }*/
+        for (BpmApprovePo po : approvals) {
+            StringBuilder sql1 = new StringBuilder("update ibps_bpm_approval_his set COMPLETE_TIME_=#{p0},CREATE_TIME_=#{p1}");
+            List<Object> params1 = new ArrayList<>();
+            params1.add(po.getCompleteTime());//P0
+            params1.add(po.getCompleteTime());//P1
+            params1.add(po.getId());//p2
+
+            // 只有opinion不为空时才更新OPINION_字段
+            if (StringUtils.isNotEmpty(po.getOpinion())) {
+                params1.add(po.getOpinion());//p3
+                sql1.append(",OPINION_=#{p3}");
+            }
+            sql1.append(" where id_=#{p2}");
+            commonDao.execute(sql1.toString(), params1.toArray());
+
+            // 更新ibps_bpm_oper_log
+            if (StringUtils.isNotEmpty(po.getTaskKey())) {
+                StringBuilder sql2 = new StringBuilder("update ibps_bpm_oper_log set CREATE_TIME_=#{p0}");
+                List<Object> params2 = new ArrayList<>();
+                params2.add(po.getCompleteTime());//P0
+                params2.add(po.getProcInstId());//P1
+                params2.add(po.getTaskKey());//P2
+
+                // 只有opinion不为空时才更新OPTION_字段
+                if (StringUtils.isNotEmpty(po.getOpinion())) {
+                    params2.add(po.getOpinion());//P3
+                    sql2.append(",OPTION_=#{p3}");
+                }
+                sql2.append(" where proc_inst_id_=#{p1} and node_id_=#{p2}");
+                commonDao.execute(sql2.toString(), params2.toArray());
             }
         }
         commonDao.execute("update ibps_bpm_inst_his set end_TIME_=#{p0} where id_=#{p1} ", new Object[]{t, id});