批量修改协议 协议历史记录bug 费用轨迹显示人名

src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementController.java

@@ -104,20 +104,6 @@ public class PtlAgreementController extends BaseController {
             PtlAgreement ptlAgreement = new PtlAgreement();
             ptlAgreement.setId(agreementId);
             ptlAgreement.setValidStatus(pltAgreementBatchVo.getValidStatus());
-            ptlAgreements.add(ptlAgreement);
-        }
-        boolean b = ptlAgreementService.updateBatchById(ptlAgreements);
-        AssertionUtils.isSucceed(b, "批量修改协议失败");
-        return HttpResult.ok("批量修改协议成功");
-    }
-
-    @PostMapping("/batchAuditType")
-    @ApiOperation("批量修改协议是否启用状态")
-    public HttpResult<Object> batchAuditType(@RequestBody PltAgreementBatchVo pltAgreementBatchVo) {
-        List<PtlAgreement> ptlAgreements = new ArrayList<>();
-        for (String agreementId : pltAgreementBatchVo.getAgreementIds()) {
-            PtlAgreement ptlAgreement = new PtlAgreement();
-            ptlAgreement.setId(agreementId);
             ptlAgreement.setAuditType(pltAgreementBatchVo.getAuditType());
             ptlAgreements.add(ptlAgreement);
         }
@@ -126,8 +112,6 @@ public class PtlAgreementController extends BaseController {
         return HttpResult.ok("批量修改协议成功");
     }
 
-
-
     @GetMapping("/{agreementId}")
     @ApiOperation("通过协议id查询所有信息")
     public HttpResult<PtlAgreementQueryVo> getByAgreementId(@PathVariable String agreementId) {

src/main/java/com/ydtech/modules/protocols/dao/PtlAgreementProductCostsTrajectoryMapper.java

@@ -3,6 +3,10 @@ package com.ydtech.modules.protocols.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsTrajectory;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementUndwrtRulesAttr;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 
 /**
@@ -11,9 +15,17 @@ import com.ydtech.modules.protocols.entity.po.PtlAgreementUndwrtRulesAttr;
  * @createDate 2024-2-22 15:44:29
  */
 public interface PtlAgreementProductCostsTrajectoryMapper extends BaseMapper<PtlAgreementProductCostsTrajectory> {
-
+    @Select({
+            "SELECT t.*, u.name as userName",
+            "FROM ptl_agreement_product_costs_trajectory t ",
+            "LEFT JOIN sys_user u ON t.create_by = u.id ",
+            "WHERE t.costs_id = #{costsId} ",
+            "ORDER BY t.create_time ASC"
+    })
+    List<PtlAgreementProductCostsTrajectory> getTrajectoryWithUser(@Param("costsId") String costsId);
 }
 
 
 
 
+

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

@@ -34,4 +34,7 @@ public class PtlAgreementProductCostsTrajectory {
 
     @TableField(value = "create_by")
     private String createBy;
+
+    @TableField(exist = false)
+    private String userName;
 }

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

@@ -1039,6 +1039,7 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
             //生成批次ID
             String uuid = IdGenerate.nextId();
             ptlAgreementProductCostsNewHistory.setBatch(uuid);
+            ptlAgreementProductCostsNewHistory.setAgreementId(ptlAgreementProductCostsNew.getAgreementId());
             ptlAgreementProductCostsNewHistory.setProductId(ptlAgreementProductCostsNew.getProductId());
             ptlAgreementProductCostsNewHistory.setProductName(ptlAgreementProductCostsNew.getProductName());
             ptlAgreementProductCostsNewHistory.setOperatorType("update");

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

@@ -11,6 +11,7 @@ import com.ydtech.modules.protocols.service.PtlAgreementUndwrtRulesAttrLinkServi
 import com.ydtech.utils.idgen.IdGenerate;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -23,6 +24,9 @@ import java.util.List;
 public class PtlAgreementProductCostsTrajectoryServiceImpl extends ServiceImpl<PtlAgreementProductCostsTrajectoryMapper, PtlAgreementProductCostsTrajectory>
         implements PtlAgreementProductCostsTrajectoryService {
 
+    @Resource
+    PtlAgreementProductCostsTrajectoryMapper ptlAgreementProductCostsTrajectoryMapper;
+
     @Override
     public boolean addCostsTrajectory(String costsId, String desc, String userId) {
         PtlAgreementProductCostsTrajectory trajectory = new PtlAgreementProductCostsTrajectory();
@@ -36,6 +40,6 @@ public class PtlAgreementProductCostsTrajectoryServiceImpl extends ServiceImpl<P
 
     @Override
     public List<PtlAgreementProductCostsTrajectory> getTrajectory(String costsId) {
-        return lambdaQuery().eq(PtlAgreementProductCostsTrajectory::getCostsId, costsId).orderByAsc(PtlAgreementProductCostsTrajectory::getCreateTime).list();
+        return ptlAgreementProductCostsTrajectoryMapper.getTrajectoryWithUser(costsId);
     }
 }