操作人 修改人都变成人名

src/main/java/com/ydtech/modules/protocol/dao/PtlAgreementHistoryMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementHistory;
 import com.ydtech.modules.protocol.entity.vo.PtlAgreementProductQueryVo;
+import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNewHistory;
+import com.ydtech.modules.protocols.entity.vo.AgreementProductQueryVo;
 
 import java.util.HashMap;
 import java.util.List;
@@ -18,6 +20,9 @@ import java.util.List;
 public interface PtlAgreementHistoryMapper extends BaseMapper<PtlAgreementHistory> {
     Page<HashMap> pageHistory(Page page, PtlAgreementProductQueryVo vo);
 
+    Page<PtlAgreementProductCostsNewHistory> getCostHistoryDetail(Page page, AgreementProductQueryVo agreementProductQueryVo);
+
+
 }
 
 

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreement.java

@@ -196,6 +196,13 @@ public class PtlAgreement implements Serializable {
     @TableField(value = "modified_by")
     private String modifiedBy;
 
+
+    /**
+     * 修改人
+     */
+    @TableField(value = "modified_name")
+    private String modifiedName;
+
     /**
      * 修改时间
      */

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementHistoryConvertQueryVo.java

@@ -203,6 +203,8 @@ public class PtlAgreementHistoryConvertQueryVo {
     @TableField(value = "operator")
     private String operator;
 
+    private String operatorName;
+
     @TableField(value = "operator_type")
     private String operatorType;
 

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementPageVo.java

@@ -41,6 +41,9 @@ public class PtlAgreementPageVo extends PageRequest {
     @ApiModelProperty("修改人")
     private String modifiedBy;
 
+    @ApiModelProperty("修改人名字")
+    private String modifiedName;
+
     @ApiModelProperty("省市区")
     private String areaCode;
 

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementHistoryServiceImpl.java

@@ -84,7 +84,7 @@ public class PtlAgreementHistoryServiceImpl extends ServiceImpl<PtlAgreementHist
             ptlAgreementHistoryConvertQueryVo.setUnderwritingDescription(hashJson.getString("underwriting_description"));
             ptlAgreementHistoryConvertQueryVo.setOperatorType(hashJson.getString("operator_type"));
             ptlAgreementHistoryConvertQueryVo.setOperator(hashJson.getString("operator"));
-
+            ptlAgreementHistoryConvertQueryVo.setOperatorName(hashJson.getString("name"));
             String operatorTimeStr = hashJson.getString("operator_time");
             LocalDateTime operatorTime = LocalDateTime.parse(operatorTimeStr);
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -12,6 +12,7 @@ import com.ydtech.constants.enums.dict.agreement.AgreementType;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.order.service.InsCrawlerOrderService;
@@ -196,6 +197,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
+        ptlAgreement.setModifiedName(BaseController.getUser().getName());
         ptlAgreement.setUpdateTime(LocalDateTime.now());
         //更新协议信息
         baseMapper.updateById(ptlAgreement);
@@ -215,6 +217,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
+        ptlAgreement.setModifiedName(BaseController.getUser().getName());
         ptlAgreement.setUpdateTime(LocalDateTime.now());
         //更新协议信息
         baseMapper.updateById(ptlAgreement);
@@ -239,6 +242,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
+        ptlAgreement.setModifiedName(BaseController.getUser().getName());
         ptlAgreement.setUpdateTime(LocalDateTime.now());
         //更新协议信息
         baseMapper.updateById(ptlAgreement);
@@ -291,6 +295,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
+        ptlAgreement.setModifiedName(BaseController.getUser().getName());
         ptlAgreement.setUpdateTime(LocalDateTime.now());
         //更新协议信息
         baseMapper.updateById(ptlAgreement);
@@ -310,6 +315,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
+        ptlAgreement.setModifiedName(BaseController.getUser().getName());
         ptlAgreement.setUpdateTime(LocalDateTime.now());
         //更新协议信息
         baseMapper.updateById(ptlAgreement);
@@ -333,6 +339,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             throw new SystemException("协议不存在");
         }
         ptlAgreement.setModifiedBy(userName);
+        ptlAgreement.setModifiedName(BaseController.getUser().getName());
         ptlAgreement.setUpdateTime(LocalDateTime.now());
         //更新协议信息
         baseMapper.updateById(ptlAgreement);
@@ -360,6 +367,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCreator()), PtlAgreement::getCreator, ptlAgreementPageVo.getCreator())
                 // 修改人
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getModifiedBy()), PtlAgreement::getModifiedBy, ptlAgreementPageVo.getModifiedBy())
+                // 修改人名字
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getModifiedName()), PtlAgreement::getModifiedName, ptlAgreementPageVo.getModifiedName())
                 // 合作公司
                 .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(), PtlAgreement::getPartnerCompaniesId, lowerId)
                 // 费用描述
@@ -512,6 +521,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
 
         ptlAgreement.setProductsCode(agreementSaveDto.getProductsCode());
         ptlAgreement.setModifiedBy(userName);
+        ptlAgreement.setModifiedName(BaseController.getUser().getName());
         ptlAgreement.setUpdateTime(LocalDateTime.now());
         HttpResult<PtlAgreementQueryVo> byAgreementId = this.getByAgreementId(agreementId);
         // 修改协议

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsNewHistory.java

@@ -198,6 +198,9 @@ public class PtlAgreementProductCostsNewHistory {
     @TableField(value = "modifier")
     private String modifier;
 
+    @TableField(exist = false)
+    private String modifierName;
+
     @ApiModelProperty(value = "操作时间")
     @TableField(value = "operator_time")
     private LocalDateTime operatorTime;

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductQueryVo.java

@@ -53,10 +53,10 @@ public class AgreementProductQueryVo extends PageRequest {
     private String operatorType;
 
     @ApiModelProperty("操作开始时间")
-    private LocalDate operatorStartTime;
+    private String operatorStartTime;
 
     @ApiModelProperty("操作结束时间")
-    private LocalDate operatorEndTime;
+    private String operatorEndTime;
 
 
 

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewHistoryServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.protocol.dao.PtlAgreementHistoryMapper;
 import com.ydtech.modules.protocol.entity.po.PtlAreaLicense;
 import com.ydtech.modules.protocol.service.PtlAreaLicenseService;
 import com.ydtech.modules.protocols.dao.PtlAgreementProductCostsNewHistoryMapper;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -40,20 +42,13 @@ public class PtlAgreementProductCostsNewHistoryServiceImpl extends ServiceImpl<P
     @Autowired
     PtlAgreementProductCostsNewService ptlAgreementProductCostsNewService;
 
+    @Resource
+    PtlAgreementHistoryMapper ptlAgreementHistoryMapper;
     @Override
     public Page<PtlAgreementProductCostsNewHistory> pageHistory(AgreementProductQueryVo agreementProductQueryVo, List<PtlAgreementUndwrtRulesAttr> undwrtRulesAttrList) {
         Page page = buildPageRequest(agreementProductQueryVo.getPageDto());
         Page<PtlAgreementProductCostsNewHistory> historyVoPage = new Page<>();
-        //获取当前协议下的产品
-
-        QueryWrapper<PtlAgreementProductCostsNewHistory> wrapper = new QueryWrapper<>();
-        wrapper
-                .eq("agreement_id", agreementProductQueryVo.getAgreementId())
-                .eq(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperator()), "modifier", agreementProductQueryVo.getOperator())
-                .eq(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperatorType()), "operator_type", agreementProductQueryVo.getOperatorType())
-                .ge(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperatorStartTime()), "DATE(`operator_time`)", agreementProductQueryVo.getOperatorStartTime())
-                .le(!ObjectUtils.isEmpty(agreementProductQueryVo.getOperatorEndTime()), "DATE(`operator_time`)", agreementProductQueryVo.getOperatorEndTime());
-        Page selectPage = baseMapper.selectPage(page, wrapper);
+        Page selectPage = ptlAgreementHistoryMapper.getCostHistoryDetail(page, agreementProductQueryVo);
         List<PtlAgreementProductCostsNewHistory> records = selectPage.getRecords();
 
         if (records.size() == 0) {

src/main/resources/mapper/modules/protocol/PtlAgreementHistoryMapper.xml

@@ -47,21 +47,48 @@
             iaah.api_type,
             iaah.fields,
             iaah.username,
-            iaah.password
+            iaah.password,
+            su.name
         FROM
             ptl_agreement_history iah
                 LEFT JOIN ptl_agreement_attribution_history iaah ON iah.batch = iaah.batch
+                LEFT JOIN sys_user su ON iah.operator = su.id
         WHERE
             iah.agreement_id = #{vo.agreementId}
         <if test="vo.operatorType != null and vo.operatorType != ''">
             AND iah.operator_type = #{vo.operatorType}
         </if>
         <if test="vo.operator != null and vo.operator != ''">
-            AND iah.operator = #{vo.operator}
+            AND su.name = #{vo.operator}
         </if>
         <if test="vo.operatorStartTime != null and vo.operatorStartTime != ''">
             AND DATE(iah.operator_time) between #{vo.operatorStartTime} AND #{vo.operatorEndTime}
         </if>
     </select>
 
+    <select id="getCostHistoryDetail" resultType="com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNewHistory">
+        SELECT
+            papcnh.*,
+            su.name AS modifierName
+        FROM
+            ptl_agreement_product_costs_new_history AS papcnh
+            JOIN
+            sys_user AS su
+        ON
+            papcnh.modifier = su.id
+        WHERE
+            papcnh.agreement_id = #{agreementProductQueryVo.agreementId}
+        <if test="agreementProductQueryVo.operatorType != null and agreementProductQueryVo.operatorType != ''">
+            AND iah.operator_type = #{agreementProductQueryVo.operatorType}
+        </if>
+        <if test="agreementProductQueryVo.operator != null and agreementProductQueryVo.operator != ''">
+            AND su.name = #{agreementProductQueryVo.operator}
+        </if>
+        <if test="agreementProductQueryVo.operatorStartTime != null and agreementProductQueryVo.operatorStartTime != ''">
+            and DATE(papcnh.operator_time) &gt;= #{agreementProductQueryVo.operatorStartTime, jdbcType=DATE}
+        </if>
+        <if test="agreementProductQueryVo.operatorEndTime != null and agreementProductQueryVo.operatorEndTime != ''">
+            and DATE(papcnh.operator_time) &lt;= #{agreementProductQueryVo.operatorEndTime, jdbcType=DATE}
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper/modules/protocols/PtlAgreementProductCostsNewMapper.xml

@@ -22,8 +22,11 @@
         <if test="params.isAudit != null and params.isAudit != ''">
             AND papcn.is_audit = #{params.isAudit}
         </if>
-        <if test="params.productCode != null and params.productCode != ''">
-            AND papcn.product_id = #{params.productCode}
+        <if test="params.productCode != null and params.productCode.size() > 0">
+            AND papcn.product_id in
+            <foreach item="item" index="index" collection="params.productCode" open="(" separator="," close=")">
+            #{item}
+            </foreach>
         </if>
         <if test="params.createStartTime != null and params.createStartTime != ''">
             and papcn.create_time BETWEEN #{params.createStartTime} and #{params.createEndTime}