工作组收费通知修改

jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.dto.SendMessageDTO;
@@ -424,8 +425,16 @@ public class PayWorkingGroupSubItemController extends JeroController<PayWorkingG
 				 return Result.error("id不能为空!");
 			 }
 		 }
-		 input.setList(Arrays.asList(input.getIds().split(",")));
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		 payWorkingGroupSubItemService.updateBatchSetCharge(input);
+		 LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
+		 updatePayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getId,Arrays.asList(s));
+		 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,input.getCharge());
+		 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getReceivableAmount,input.getReceivableAmount());
+		 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,input.getChargeNoticeNo());
+		 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeId,input.getChargeNoticeId());
+		 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateBy,sysUser.getUsername());
+		 updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getUpdateTime,new Date());
+		 payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem);
 		 return Result.OK("设置收费通知成功!");
 	 }
 

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/PayWorkingGroupSubItemMapper.java

@@ -21,15 +21,6 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroupSubItem> {
-    /**
-     * @Description 批量更新收费通知号
-     * @Author  lqt
-     * @Date   2021/9/2
-     * @Param
-     * @Return
-     * @Exception
-     */
-    void updateBatchSetCharge(SetChargeInput input);
 
     /**
      * @Description 分页查询

jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml

@@ -2,17 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jero.project.mapper.PayWorkingGroupSubItemMapper">
 
-    <update id="updateBatchSetCharge">
-        UPDATE pay_working_group_subitem SET
-        receivable_amount = #{receivableAmount},
-        charge_notice_no = #{chargeNoticeNo},
-        charge_notice_id = #{chargeNoticeId}
-        WHERE id IN
-        <foreach collection="list" open="(" close=")" item="item" index="index" separator=",">
-            #{item}
-        </foreach>
-
-    </update>
     <select id="queryPageList" resultType="com.jero.project.entity.PayWorkingGroupSubItem">
         SELECT
             pwgs.id,

jero-boot-incoming-payment/src/main/java/com/jero/project/service/IPayWorkingGroupSubItemService.java

@@ -21,15 +21,6 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroupSubItem> {
-    /**
-    * @Description 批量更新收费通知号
-    * @Author  lqt
-    * @Date   2021/9/2
-    * @Param
-    * @Return
-    * @Exception
-    */
-    void updateBatchSetCharge(SetChargeInput input);
     /**
     * @Description 分页查询
     * @Author  lqt

jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java

@@ -26,7 +26,6 @@ import com.jero.project.entity.*;
 import com.jero.project.service.IPayWorkingGroupService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
-import com.jero.project.vo.SetChargeInput;
 import com.jero.temporary.entity.PayCompanyManagementTemporary;
 import com.jero.temporary.entity.PayContactsManagementTemporary;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
@@ -37,7 +36,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,33 +59,29 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
 
     @Resource
     private PayWorkingGroupSubItemMapper payWorkingGroupSubItemMapper;
-    @Autowired
+    @Resource
     private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
-    @Autowired
+    @Resource
     private IPayCompanyManagementService payCompanyManagementService;
-    @Autowired
+    @Resource
     private IPayContactsManagementService payContactsManagementService;
-    @Autowired
+    @Resource
     private IPayWorkingGroupService payWorkingGroupService;
-    @Autowired
+    @Resource
     private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
-    @Autowired
+    @Resource
     private IPayIncomeContractService payIncomeContractService;
-    @Autowired
+    @Resource
     private IPayPackCompanyProjectService payPackCompanyProjectService;
-    @Autowired
+    @Resource
     private ProjectDetailService projectDetailService;
     @Resource
     private IPayMeetingRemindRecordService payMeetingRemindRecordService;
-    @Autowired
+    @Resource
     private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
 
-    @Override
-    public void updateBatchSetCharge(SetChargeInput input) {
-        payWorkingGroupSubItemMapper.updateBatchSetCharge(input);
-    }
 
     @Override
     public IPage<PayWorkingGroupSubItem> queryPageList(Page<PayWorkingGroupSubItem> page, PayWorkingGroupSubItem payWorkingGroupSubitem,String paymentDate) {

jero-boot-incoming-payment/src/main/java/com/jero/project/vo/SetChargeInput.java

@@ -16,6 +16,10 @@ public class SetChargeInput implements Serializable {
     @ApiModelProperty(value = "项目ids")
     @NotEmpty(message = "项目ids不能为空")
     private String ids;
+    /**收费通知唯一标识(收费通知号A:a,收费通知号B:b)*/
+    @ApiModelProperty(value = "收费通知唯一标识(收费通知号A:a,收费通知号B:b)")
+    @NotEmpty(message = "收费通知唯一标识不能为空")
+    private java.lang.String charge;
     /**应收金额（元）*/
     @ApiModelProperty(value = "应收金额（元）")
     @DecimalMax(value = "9999999999.99",message = "应收金额（元）格式错误")