Merge remote-tracking branch 'origin/master'

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareInfoController.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.Logical;
 import org.springframework.beans.factory.annotation.Autowired;

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemController.java

@@ -1,5 +1,6 @@
 package com.jero.modules.compare.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -184,8 +185,8 @@ public class SarFileCompareItemController extends JeroController<SarFileCompareI
 
 	@ApiOperation(value = "条款比对")
 	@PostMapping("/clauseComparisonEvent")
-	public Result<Map<String,Object>> clauseComparisonEvent(String oldItemId, String newItemId, String standHisId, String flag) throws Exception {
+	public Result<Map<String,Object>> clauseComparisonEvent(@RequestBody JSONObject json) throws Exception {
-		Map<String,Object> resultMap = sarFileCompareItemService.clauseComparisonEvent(oldItemId,newItemId,standHisId,flag);
+		Map<String,Object> resultMap = sarFileCompareItemService.clauseComparisonEvent(json);
 		return Result.OK(resultMap);
 	}
 }

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/controller/SarItemsStandCompareHisEOController.java

@@ -0,0 +1,59 @@
+package com.jero.modules.compare.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.jero.common.api.vo.Result;
+import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.system.base.controller.JeroController;
+import com.jero.modules.compare.entity.SarItemsCompareHisEO;
+import com.jero.modules.compare.service.ISarItemsCompareHisEOService;
+import com.jero.modules.system.util.MyStringUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/compare/sarItemsCompareHis")
+@Api(description = "|SarStandItemsCompareHisEO|")
+public class SarItemsStandCompareHisEOController extends JeroController<SarItemsCompareHisEO, ISarItemsCompareHisEOService>  {
+
+    private static final Logger logger = LoggerFactory.getLogger(SarItemsStandCompareHisEOController.class);
+
+    @Autowired
+    private ISarItemsCompareHisEOService sarItemsCompareHisEOService;
+
+    /**
+     * 分页列表查询
+     */
+    @AutoLog(value = "条款对比-分页列表查询")
+    @ApiOperation(value = "条款对比-分页列表查询", notes = "条款对比-分页列表查询")
+    @GetMapping(value = "/page")
+    @ApiOperationSupport(order = 1)
+    public Result<?> queryPageList(@ApiParam("当前页") @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                   @ApiParam("每页条数") @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                   @ApiParam("条款对比id") @RequestParam(name = "standHisId", defaultValue = "") String standHisId,
+                                   HttpServletRequest req) {
+
+        LambdaQueryWrapper<SarItemsCompareHisEO> queryWrapper = new LambdaQueryWrapper<>();
+        if (MyStringUtils.isNotBlank(standHisId)) {
+            queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarItemsCompareHisEO::getStandHisId, standHisId));
+        }
+
+        Page<SarItemsCompareHisEO> page = new Page<>(pageNo, pageSize);
+        IPage<SarItemsCompareHisEO> pageList = this.sarItemsCompareHisEOService.page(page, queryWrapper);
+        return Result.OK(pageList);
+    }
+
+
+}

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareInfo.java

@@ -165,4 +165,8 @@ public class SarFileCompareInfo implements Serializable {
     private String compareType;
     @TableField(exist = false)
     private String compareTypeShow;
+
+    // 比对状态：比对中、比对完成
+    @ApiModelProperty(value = "比对状态")
+    private String compareStatus;
 }

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/entity/SarItemsCompareHisEO.java

@@ -0,0 +1,67 @@
+package com.jero.modules.compare.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("sar_items_compare_his")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="sar_items_compare_his对象", description="条款对比信息表")
+public class SarItemsCompareHisEO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+
+    private String oldItemsId;
+
+    private String oldItemsName;
+
+    private String oldItemsText;
+
+    private String newItemsId;
+
+    private String newItemsName;
+
+    private String newItemsText;
+
+    private String createUser;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+    private String modifyUser;
+
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date modifyTime;
+
+    private String standHisId;
+
+    private String similarityDegree;
+
+    private String oldItemsNum;
+
+    private String newItemsNum;
+
+    private String oldRemark;
+
+    private String newRemark;
+}

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/mapper/SarItemsCompareHisEOMapper.java

@@ -0,0 +1,23 @@
+package com.jero.modules.compare.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jero.modules.compare.entity.SarItemsCompareHisEO;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *
+ * <br>
+ * <b>功能：</b>SAR_ITEMS_COMPARE_HIS SarItemsCompareHisEODao<br>
+ * <b>作者：</b>code generator<br>
+ * <b>日期：</b> 2020-02-26 <br>
+ * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
+ */
+@Mapper
+public interface SarItemsCompareHisEOMapper extends BaseMapper<SarItemsCompareHisEO> {
+
+    @Delete("delete from SAR_ITEMS_COMPARE_HIS WHERE STAND_HIS_ID = #{standHisId}")
+    void deleteByStandHisId(String standHisId);
+
+    int insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO);
+}

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/mapper/xml/SarItemsCompareHisEOMapper.xml

@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jero.modules.compare.mapper.SarItemsCompareHisEOMapper" >
+  <!-- Result Map-->
+  <resultMap id="BaseResultMap" type="com.jero.modules.compare.entity.SarItemsCompareHisEO" >
+    <id column="id" property="id" />
+    <result column="old_items_id" property="oldItemsId" />
+    <result column="old_items_name" property="oldItemsName" />
+    <result column="old_items_text" property="oldItemsText" />
+    <result column="new_items_id" property="newItemsId" />
+    <result column="new_items_name" property="newItemsName" />
+    <result column="new_items_text" property="newItemsText" />
+    <result column="create_user" property="createUser" />
+    <result column="create_time" property="createTime" />
+    <result column="modify_user" property="modifyUser" />
+    <result column="modify_time" property="modifyTime" />
+    <result column="stand_his_id" property="standHisId" />
+    <result column="similarity_degree" property="similarityDegree" />
+    <result column="old_items_num" property="oldItemsNum" />
+    <result column="new_items_num" property="newItemsNum" />
+      <result column="old_remark" property="oldRemark" />
+      <result column="new_remark" property="newRemark" />
+  </resultMap>
+
+  <!-- SAR_ITEMS_COMPARE_HIS table all fields -->
+  <sql id="Base_Column_List" >
+     id, old_items_id, old_items_name, old_items_text, new_items_id, new_items_name, new_items_text,
+     create_user, create_time, modify_user, modify_time, stand_his_id, similarity_degree,
+      old_items_num, new_items_num,old_remark,new_remark
+  </sql>
+
+  <!-- 查询条件 -->
+  <sql id="Base_Where_Clause">
+    where 1=1
+    <trim suffixOverrides="," >
+      <if test="id != null" >
+        and id ${idOperator} #{id}
+      </if>
+      <if test="oldItemsId != null" >
+        and old_items_id ${oldItemsIdOperator} #{oldItemsId}
+      </if>
+      <if test="oldItemsName != null" >
+        and old_items_name ${oldItemsNameOperator} #{oldItemsName}
+      </if>
+      <if test="oldItemsText != null" >
+        and old_items_text ${oldItemsTextOperator} #{oldItemsText}
+      </if>
+      <if test="newItemsId != null" >
+        and new_items_id ${newItemsIdOperator} #{newItemsId}
+      </if>
+      <if test="newItemsName != null" >
+        and new_items_name ${newItemsNameOperator} #{newItemsName}
+      </if>
+      <if test="newItemsText != null" >
+        and new_items_text ${newItemsTextOperator} #{newItemsText}
+      </if>
+      <if test="createUser != null" >
+        and create_user ${createUserOperator} #{createUser}
+      </if>
+      <if test="createTime != null" >
+        and create_time ${createTimeOperator} #{createTime}
+      </if>
+      <if test="createTime1 != null" >
+        and create_time &gt;= #{createTime1}
+      </if>
+      <if test="createTime2 != null" >
+        and create_time &lt;= #{createTime2}
+      </if>
+      <if test="modifyUser != null" >
+        and modify_user ${modifyUserOperator} #{modifyUser}
+      </if>
+      <if test="modifyTime != null" >
+        and modify_time ${modifyTimeOperator} #{modifyTime}
+      </if>
+      <if test="modifyTime1 != null" >
+        and modify_time &gt;= #{modifyTime1}
+      </if>
+      <if test="modifyTime2 != null" >
+        and modify_time &lt;= #{modifyTime2}
+      </if>
+      <if test="standHisId != null" >
+        and stand_his_id ${standHisIdOperator} #{standHisId}
+      </if>
+      <if test="similarityDegree != null" >
+        and similarity_degree ${similarityDegreeOperator} #{similarityDegree}
+      </if>
+      <if test="oldItemsNum != null" >
+        and old_items_num ${oldItemsNumOperator} #{oldItemsNum}
+      </if>
+      <if test="newItemsNum != null" >
+        and new_items_num ${newItemsNumOperator} #{newItemsNum}
+      </if>
+    </trim>
+  </sql>
+
+  <!-- 插入记录 -->
+  <insert id="insert" parameterType="com.jero.modules.compare.entity.SarItemsCompareHisEO" >
+    <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+        SELECT SEQ_SAR_ITEMS_COMPARE_HIS.NEXTVAL FROM DUAL
+    </selectKey> -->
+    insert into SAR_ITEMS_COMPARE_HIS(<include refid="Base_Column_List" />)
+    values (#{id, jdbcType=VARCHAR}, #{oldItemsId, jdbcType=VARCHAR}, #{oldItemsName, jdbcType=VARCHAR}, #{oldItemsText, jdbcType=CLOB}, #{newItemsId, jdbcType=VARCHAR}, #{newItemsName, jdbcType=VARCHAR}, #{newItemsText, jdbcType=CLOB}, #{createUser, jdbcType=VARCHAR}, #{createTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{standHisId, jdbcType=VARCHAR}, #{similarityDegree, jdbcType=VARCHAR}, #{oldItemsNum, jdbcType=VARCHAR}, #{newItemsNum, jdbcType=VARCHAR})
+  </insert>
+
+  <!-- 动态插入记录 主键是序列 -->
+  <insert id="insertSelective" parameterType="com.jero.modules.compare.entity.SarItemsCompareHisEO" >
+        <!-- <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+        SELECT SEQ_SAR_ITEMS_COMPARE_HIS.NEXTVAL FROM DUAL
+    </selectKey> -->
+        insert into SAR_ITEMS_COMPARE_HIS
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+                <if test="id != null" >id,</if>
+                <if test="oldItemsId != null" >old_items_id,</if>
+                <if test="oldItemsName != null" >old_items_name,</if>
+                <if test="oldItemsText != null" >old_items_text,</if>
+                <if test="newItemsId != null" >new_items_id,</if>
+                <if test="newItemsName != null" >new_items_name,</if>
+                <if test="newItemsText != null" >new_items_text,</if>
+                <if test="createUser != null" >create_user,</if>
+                <if test="createTime != null" >create_time,</if>
+                <if test="modifyUser != null" >modify_user,</if>
+                <if test="modifyTime != null" >modify_time,</if>
+                <if test="standHisId != null" >stand_his_id,</if>
+                <if test="similarityDegree != null" >similarity_degree,</if>
+                <if test="oldItemsNum != null" >old_items_num,</if>
+                <if test="newItemsNum != null" >new_items_num,</if>
+                <if test="oldRemark != null" >old_remark,</if>
+                <if test="newRemark != null" >new_remark,</if>
+            </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+                <if test="id != null" >#{id, jdbcType=VARCHAR},</if>
+                <if test="oldItemsId != null" >#{oldItemsId, jdbcType=VARCHAR},</if>
+                <if test="oldItemsName != null" >#{oldItemsName, jdbcType=VARCHAR},</if>
+                <if test="oldItemsText != null" >#{oldItemsText, jdbcType=CLOB},</if>
+                <if test="newItemsId != null" >#{newItemsId, jdbcType=VARCHAR},</if>
+                <if test="newItemsName != null" >#{newItemsName, jdbcType=VARCHAR},</if>
+                <if test="newItemsText != null" >#{newItemsText, jdbcType=CLOB},</if>
+                <if test="createUser != null" >#{createUser, jdbcType=VARCHAR},</if>
+                <if test="createTime != null" >#{createTime, jdbcType=TIMESTAMP},</if>
+                <if test="modifyUser != null" >#{modifyUser, jdbcType=VARCHAR},</if>
+                <if test="modifyTime != null" >#{modifyTime, jdbcType=TIMESTAMP},</if>
+                <if test="standHisId != null" >#{standHisId, jdbcType=VARCHAR},</if>
+                <if test="similarityDegree != null" >#{similarityDegree, jdbcType=VARCHAR},</if>
+                <if test="oldItemsNum != null" >#{oldItemsNum, jdbcType=VARCHAR},</if>
+                <if test="newItemsNum != null" >#{newItemsNum, jdbcType=VARCHAR},</if>
+                <if test="oldRemark != null" >#{oldRemark, jdbcType=VARCHAR},</if>
+                <if test="newRemark != null" >#{newRemark, jdbcType=VARCHAR},</if>
+            </trim>
+  </insert>
+
+<!--  &lt;!&ndash; 根据pk，修改记录&ndash;&gt;-->
+<!--  <update id="updateByPrimaryKey" parameterType="com.jero.modules.compare.entity.SarItemsCompareHisEO" >-->
+<!--    update SAR_ITEMS_COMPARE_HIS-->
+<!--       set  old_items_id = #{oldItemsId},-->
+<!--            old_items_name = #{oldItemsName},-->
+<!--            old_items_text = #{oldItemsText},-->
+<!--            new_items_id = #{newItemsId},-->
+<!--            new_items_name = #{newItemsName},-->
+<!--            new_items_text = #{newItemsText},-->
+<!--            create_user = #{createUser},-->
+<!--            create_time = #{createTime},-->
+<!--            modify_user = #{modifyUser},-->
+<!--            modify_time = #{modifyTime},-->
+<!--            stand_his_id = #{standHisId},-->
+<!--            similarity_degree = #{similarityDegree},-->
+<!--            old_items_num = #{oldItemsNum},-->
+<!--            new_items_num = #{newItemsNum}-->
+<!--     where  id = #{id}-->
+<!--  </update>-->
+
+<!--  &lt;!&ndash; 修改记录，只修改只不为空的字段 &ndash;&gt;-->
+<!--  <update id="updateByPrimaryKeySelective" parameterType="com.jero.modules.compare.entity.SarItemsCompareHisEO" >-->
+<!--    update SAR_ITEMS_COMPARE_HIS-->
+<!--    <set >-->
+<!--      <if test="oldItemsId != null" >-->
+<!--        old_items_id = #{oldItemsId},-->
+<!--      </if>-->
+<!--      <if test="oldItemsName != null" >-->
+<!--        old_items_name = #{oldItemsName},-->
+<!--      </if>-->
+<!--      <if test="oldItemsText != null" >-->
+<!--        old_items_text = #{oldItemsText},-->
+<!--      </if>-->
+<!--      <if test="newItemsId != null" >-->
+<!--        new_items_id = #{newItemsId},-->
+<!--      </if>-->
+<!--      <if test="newItemsName != null" >-->
+<!--        new_items_name = #{newItemsName},-->
+<!--      </if>-->
+<!--      <if test="newItemsText != null" >-->
+<!--        new_items_text = #{newItemsText},-->
+<!--      </if>-->
+<!--      <if test="createUser != null" >-->
+<!--        create_user = #{createUser},-->
+<!--      </if>-->
+<!--      <if test="createTime != null" >-->
+<!--        create_time = #{createTime},-->
+<!--      </if>-->
+<!--      <if test="modifyUser != null" >-->
+<!--        modify_user = #{modifyUser},-->
+<!--      </if>-->
+<!--      <if test="modifyTime != null" >-->
+<!--        modify_time = #{modifyTime},-->
+<!--      </if>-->
+<!--      <if test="standHisId != null" >-->
+<!--        stand_his_id = #{standHisId},-->
+<!--      </if>-->
+<!--      <if test="similarityDegree != null" >-->
+<!--        similarity_degree = #{similarityDegree},-->
+<!--      </if>-->
+<!--      <if test="oldItemsNum != null" >-->
+<!--        old_items_num = #{oldItemsNum},-->
+<!--      </if>-->
+<!--      <if test="newItemsNum != null" >-->
+<!--        new_items_num = #{newItemsNum},-->
+<!--      </if>-->
+<!--        <if test="oldRemark != null" >-->
+<!--            old_remark = #{oldRemark},-->
+<!--        </if>-->
+<!--        <if test="newRemark != null" >-->
+<!--            new_remark = #{newRemark},-->
+<!--        </if>-->
+<!--    </set>-->
+<!--     where id = #{id}-->
+<!--  </update>-->
+
+<!--  &lt;!&ndash; 根据id查询 SAR_ITEMS_COMPARE_HIS &ndash;&gt;-->
+<!--  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String">-->
+<!--    select <include refid="Base_Column_List" />-->
+<!--      from SAR_ITEMS_COMPARE_HIS-->
+<!--     where id = #{value}-->
+
+<!--  </select>-->
+
+<!--  &lt;!&ndash; 删除记录 &ndash;&gt;-->
+<!--  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">-->
+<!--    delete from SAR_ITEMS_COMPARE_HIS-->
+<!--     where id = #{value}-->
+
+<!--  </delete>-->
+
+<!--  &lt;!&ndash; SAR_ITEMS_COMPARE_HIS 列表总数&ndash;&gt;-->
+<!--  <select id="queryByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">-->
+<!--    select count(1) from SAR_ITEMS_COMPARE_HIS-->
+<!--    <include refid="Base_Where_Clause"/>-->
+<!--  </select>-->
+
+<!--  &lt;!&ndash; 查询SAR_ITEMS_COMPARE_HIS列表 &ndash;&gt;-->
+<!--  <select id="queryByPage" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">-->
+<!--	select <include refid="Base_Column_List" /> from-->
+<!--		(select tmp_tb.* from-->
+<!--			(select <include refid="Base_Column_List" /> from SAR_ITEMS_COMPARE_HIS-->
+<!--			 <include refid="Base_Where_Clause"/>-->
+<!--			 <if test="pager.orderCondition != null and pager.orderCondition != ''" >-->
+<!--			 	${pager.orderCondition}-->
+<!--			 </if>-->
+<!--              ORDER BY CREATE_TIME DESC-->
+<!--			) tmp_tb limit ${pager.startIndex-1},${pageSize}) a-->
+<!--  </select>-->
+
+<!--  <select id="queryByList" resultMap="BaseResultMap" parameterType="com.adc.da.base.page.BasePage">-->
+<!--    select <include refid="Base_Column_List"/> from SAR_ITEMS_COMPARE_HIS-->
+<!--    <include refid="Base_Where_Clause"/>-->
+<!--    <if test="pager.orderCondition != null and pager.orderCondition != ''" >-->
+<!--       ${pager.orderCondition}-->
+<!--    </if>-->
+<!--  </select>-->
+
+</mapper>

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareInfoService.java

@@ -1,10 +1,12 @@
 package com.jero.modules.compare.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.compare.entity.SarFileCompareDetailVO;
 import com.jero.modules.compare.entity.SarFileCompareInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 文档对比信息表

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemService.java

@@ -1,5 +1,6 @@
 package com.jero.modules.compare.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.compare.entity.SarFileCompareItem;
 
@@ -73,5 +74,5 @@ public interface ISarFileCompareItemService extends IService<SarFileCompareItem>
 
     List<String> clauseComparison(String lid,String rid);
 
-    Map<String,Object> clauseComparisonEvent(String oldItemId, String newItemId, String standHisId,String flag);
+    Map<String,Object> clauseComparisonEvent(JSONObject json);
 }

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/ISarItemsCompareHisEOService.java

@@ -0,0 +1,13 @@
+package com.jero.modules.compare.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.modules.compare.entity.SarFileCompareInfo;
+import com.jero.modules.compare.entity.SarItemsCompareHisEO;
+
+public interface ISarItemsCompareHisEOService extends IService<SarItemsCompareHisEO> {
+
+    void insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO);
+
+    void deleteByStandHisId(String id);
+}

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java

@@ -1,11 +1,13 @@
 package com.jero.modules.compare.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.enums.LanguageEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.MessageUtils;
+import com.jero.common.util.UUIDUtils;
 import com.jero.modules.compare.entity.*;
 import com.jero.modules.compare.enums.CompareTypeEnum;
 import com.jero.modules.compare.enums.ReleaseConditionEnum;
@@ -13,21 +15,28 @@ import com.jero.modules.compare.mapper.SarFileCompareInfoMapper;
 import com.jero.modules.compare.service.ISarFileCompareInfoService;
 import com.jero.modules.compare.service.ISarFileCompareItemService;
 import com.jero.modules.compare.service.ISarFileCompareMenuService;
+import com.jero.modules.compare.service.ISarItemsCompareHisEOService;
 import com.jero.modules.compare.utils.CompHanLPUtils;
 import com.jero.modules.compare.utils.CompareConst;
+import com.jero.modules.compare.utils.EventEditHistoryHighLightUtil;
 import com.jero.modules.document.service.IBussDocumentLibraryEOService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.entity.SarFileSplitItemsEO;
+import com.jero.modules.split.entity.SarFileSplitItemsValEO;
 import com.jero.modules.split.entity.SarFileSplitMenuEO;
+import com.jero.modules.split.page.SarFileSplitItemsValEOPage;
 import com.jero.modules.split.service.IFileSplitItemsEOService;
 import com.jero.modules.split.service.ISarFileSplitInfoService;
+import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
 import com.jero.modules.split.service.ISarFileSplitMenuEOService;
 import com.jero.modules.system.util.MyStringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.text.NumberFormat;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -62,6 +71,12 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
     @Autowired
     private IBussDocumentLibraryEOService bussDocumentLibraryEOService;
 
+    @Autowired
+    private ISarItemsCompareHisEOService sarItemsCompareHisEOService;
+
+    @Autowired
+    private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService;
+
     /**
      * 保存
      *
@@ -204,6 +219,9 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
         }
         sarFileCompareItemService.saveBatch(leftItemList);
         sarFileCompareItemService.saveBatch(rightItemList);
+
+        sfcInfo.setCompareStatus("比对完成");
+        this.editById(sfcInfo);
         return sfcInfo.getId();
     }
 
@@ -289,6 +307,7 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl<SarFileCompareInf
         sarFileCompareInfo.setReleaseState(ReleaseConditionEnum.DRAFT.getValue());
         sarFileCompareInfo.setRemark(remark);
         sarFileCompareInfo.setCompareType(compareType);
+        sarFileCompareInfo.setCompareStatus("比对中");
         this.add(sarFileCompareInfo);
         return sarFileCompareInfo;
     }

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemServiceImpl.java

@@ -1,16 +1,22 @@
 package com.jero.modules.compare.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.util.UUIDUtils;
 import com.jero.modules.compare.entity.SarFileCompareInfo;
 import com.jero.modules.compare.entity.SarFileCompareItem;
+import com.jero.modules.compare.entity.SarItemsCompareHisEO;
 import com.jero.modules.compare.mapper.SarFileCompareItemMapper;
+import com.jero.modules.compare.service.ISarFileCompareInfoService;
 import com.jero.modules.compare.service.ISarFileCompareItemService;
+import com.jero.modules.compare.service.ISarItemsCompareHisEOService;
 import com.jero.modules.compare.utils.CompHanLPUtils;
 import com.jero.modules.compare.utils.CompareConst;
 import com.jero.modules.compare.utils.DiffUtils;
 import com.jero.modules.compare.utils.EventEditHistoryHighLightUtil;
+import com.jero.modules.documenttool.entity.DocumentSplitInfo;
+import com.jero.modules.documenttool.mapper.DocumentSplitMapper;
 import com.jero.modules.split.entity.SarFileSplitItemsEO;
 import com.jero.modules.split.entity.SarFileSplitItemsValEO;
 import com.jero.modules.split.page.SarFileSplitItemsValEOPage;
@@ -35,6 +41,18 @@ public class SarFileCompareItemServiceImpl extends ServiceImpl<SarFileCompareIte
     @Autowired
     private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService;
 
+//    @Autowired
+//    private ISarFileSplitItemsEOService sarFileSplitItemsEOService;
+
+    @Autowired
+    private ISarItemsCompareHisEOService sarItemsCompareHisEOService;
+
+    @Autowired
+    private ISarFileCompareInfoService sarFileCompareInfoService;
+
+    @Autowired
+    private DocumentSplitMapper documentSplitMapper;
+
     /**
      * 保存
      *
@@ -145,7 +163,12 @@ public class SarFileCompareItemServiceImpl extends ServiceImpl<SarFileCompareIte
     }
 
     @Override
-    public Map<String, Object> clauseComparisonEvent(String oldItemId, String newItemId, String standHisId, String flag) {
+    public Map<String, Object> clauseComparisonEvent(JSONObject json) {
+        String oldItemId = json.getString("oldItemId");
+        String newItemId = json.getString("newItemId");
+        String standHisId = json.getString("standHisId");
+        String flag = json.getString("flag");
+
         Map<String,Object> resultMap = new HashMap<String, Object>();
         String oldTxt = "";
         SarFileSplitItemsValEOPage oldPage = new SarFileSplitItemsValEOPage();
@@ -194,6 +217,7 @@ public class SarFileCompareItemServiceImpl extends ServiceImpl<SarFileCompareIte
         resultMap.put("similarityDegree",similarityDegree);
         List<String> leftString = new ArrayList<>();
         List<String> rightString = new ArrayList<>();
+
         if(similarity >= 0.6){
             String[] anb = EventEditHistoryHighLightUtil.getHighLightDifferent(oldTxt.trim(), newTxt.trim());
             if(StringUtils.isNotBlank(flag) && flag.equals("2")){
@@ -227,42 +251,44 @@ public class SarFileCompareItemServiceImpl extends ServiceImpl<SarFileCompareIte
         }
         //往条款比对历史表中添加数据
         if(standHisId != null && !standHisId.isEmpty()){
-//            SarFileSplitItemsEO leftEo = sarFileSplitItemsEOService.selectByPrimaryKey(oldItemId);
+            Map<String, Object> leftMapEO = this.documentSplitMapper.queryLawsDocumentSplitById(oldItemId);
-//            SarFileSplitItemsEO rightEo = sarFileSplitItemsEOService.selectByPrimaryKey(newItemId);
+            Map<String, Object> rightMapEO = this.documentSplitMapper.queryLawsDocumentSplitById(newItemId);
-//            String leftItemsText = "";
+            String leftItemsText = "";
-//            if(leftString != null && !leftString.isEmpty()){
+            if(leftString != null && !leftString.isEmpty()){
-//                for(String left : leftString){
+                for(String left : leftString){
-//                    leftItemsText += left;
+                    leftItemsText += left;
-//                }
+                }
-//            }
+            } else {
-//            String rightItemsText = "";
+                leftItemsText = resultMap.get("leftString").toString();
-//            if(rightString != null && !rightString.isEmpty()){
+            }
-//                for(String right : rightString){
+            String rightItemsText = "";
-//                    rightItemsText += right;
+            if(rightString != null && !rightString.isEmpty()){
-//                }
+                for(String right : rightString){
-//            }
+                    rightItemsText += right;
-      /*      SarItemsCompareHisEO sarItemsCompareHisEO = new SarItemsCompareHisEO();
+                }
+            } else {
+                rightItemsText = resultMap.get("rightString").toString();
+            }
+            SarItemsCompareHisEO sarItemsCompareHisEO = new SarItemsCompareHisEO();
             sarItemsCompareHisEO.setId(UUIDUtils.randomUUID20());
-            sarItemsCompareHisEO.setOldItemsId(leftEo.getId());
+            sarItemsCompareHisEO.setOldItemsId(leftMapEO.get("id").toString());
-            sarItemsCompareHisEO.setOldItemsName(leftEo.getItemsName());
+            sarItemsCompareHisEO.setOldItemsName(leftMapEO.get("item_title").toString());
-            sarItemsCompareHisEO.setOldItemsNum(leftEo.getItemsNum());
+            sarItemsCompareHisEO.setOldItemsNum(leftMapEO.get("item_num").toString());
             sarItemsCompareHisEO.setOldItemsText(leftItemsText);
-            sarItemsCompareHisEO.setNewItemsId(rightEo.getId());
+            sarItemsCompareHisEO.setNewItemsId(rightMapEO.get("id").toString());
-            sarItemsCompareHisEO.setNewItemsName(rightEo.getItemsName());
+            sarItemsCompareHisEO.setNewItemsName(rightMapEO.get("item_title").toString());
-            sarItemsCompareHisEO.setNewItemsNum(rightEo.getItemsNum());
+            sarItemsCompareHisEO.setNewItemsNum(rightMapEO.get("item_num").toString());
             sarItemsCompareHisEO.setNewItemsText(rightItemsText);
             sarItemsCompareHisEO.setStandHisId(standHisId);
             sarItemsCompareHisEO.setSimilarityDegree(similarityDegree);
-            sarItemsCompareHisEO.setCreateUser(LoginUserUtil.getUserId());
-            sarItemsCompareHisEO.setModifyUser(LoginUserUtil.getUserId());
             sarItemsCompareHisEO.setModifyTime(new Date());
             sarItemsCompareHisEO.setCreateTime(new Date());
-            sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO);*/
+            sarItemsCompareHisEOService.insertSelective(sarItemsCompareHisEO);
         }
         SarFileCompareInfo sarStandCompareHisEO =new SarFileCompareInfo();
         sarStandCompareHisEO.setId(standHisId);
-//        sarStandCompareHisEO.setCompareStatus("比对完成");
+        sarStandCompareHisEO.setCompareStatus("比对完成");
-//        sarStandCompareHisEODao.updateByPrimaryKeySelective(sarStandCompareHisEO);
+        sarFileCompareInfoService.editById(sarStandCompareHisEO);
         if (oldList.size()==0 || newList.size()==0){
             resultMap.put("error","比对数据已删除");
         }

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/compare/service/impl/SarItemsCompareHisEOServiceImpl.java

@@ -0,0 +1,32 @@
+package com.jero.modules.compare.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.modules.compare.entity.SarItemsCompareHisEO;
+import com.jero.modules.compare.mapper.SarItemsCompareHisEOMapper;
+import com.jero.modules.compare.service.ISarItemsCompareHisEOService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+public class SarItemsCompareHisEOServiceImpl extends ServiceImpl<SarItemsCompareHisEOMapper, SarItemsCompareHisEO> implements ISarItemsCompareHisEOService {
+    private static final Logger logger = LoggerFactory.getLogger(SarItemsCompareHisEOServiceImpl.class);
+
+
+    @Autowired
+    private SarItemsCompareHisEOMapper sarItemsCompareHisEOMapper;
+
+    @Override
+    public void insertSelective(SarItemsCompareHisEO sarItemsCompareHisEO) {
+        this.sarItemsCompareHisEOMapper.insertSelective(sarItemsCompareHisEO);
+    }
+
+    @Override
+    public void deleteByStandHisId(String id) {
+        this.sarItemsCompareHisEOMapper.deleteByStandHisId(id);
+    }
+}

byd-structuredplugins-serve/laws-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java

@@ -12,13 +12,16 @@ import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.split.entity.SarFileSplitInfoEO;
 import com.jero.modules.split.entity.SarFileSplitItemsEO;
 import com.jero.modules.split.entity.SarFileSplitItemsValEO;
+import com.jero.modules.split.page.SarFileSplitItemsValEOPage;
 import com.jero.modules.split.service.IFileSplitItemsEOService;
+import com.jero.modules.split.service.ISarFileSplitItemsValEOService;
 import com.jero.modules.split.service.impl.FileSplitItemsEOServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -45,6 +48,9 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
     @Autowired
     private FileSplitItemsEOServiceImpl fileSplitItemsEOService;
 
+    @Autowired
+    private ISarFileSplitItemsValEOService sarFileSplitItemsValEOService;
+
     @Autowired
     private IOSSFileService ossFileService;
 
@@ -135,4 +141,23 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
             throw new JeroBootException(MessageUtils.getMessage(ResultCommon.ERROR));
         }
     }
+
+    @ApiOperation(value = "|SarFileSplitItemsValEO|查询")
+    @GetMapping("/getItemsValList")
+    public Result<List<SarFileSplitItemsValEO>> list(@RequestParam(value = "infoId", required = false) String infoId,@RequestParam(value = "menuId", required = false) String menuId) throws Exception {
+
+
+        SarFileSplitItemsValEOPage page = new SarFileSplitItemsValEOPage();
+        List<SarFileSplitItemsValEO> getList = sarFileSplitItemsValEOService.queryByList(page);
+        if (getList != null && !getList.isEmpty()) {
+            for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) {
+                String imgPath = sarFileSplitItemsValEO.getItemContent();
+                if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) {
+                    String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length());
+                    sarFileSplitItemsValEO.setImgName(imgName);
+                }
+            }
+        }
+        return Result.OK(getList);
+    }
 }