Commit 26e8ebcb authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.5.2' into MVP1.5.2

parents 4e47afe0 02166357
...@@ -50,6 +50,7 @@ import org.springframework.web.multipart.MultipartFile; ...@@ -50,6 +50,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
...@@ -427,6 +428,26 @@ public class TDispatchInfoController { ...@@ -427,6 +428,26 @@ public class TDispatchInfoController {
} }
} }
/**
* @Author huyc
* @Description 单个派减
* @Date 16:54 2023/3/9
* @Param
* @return
**/
@Operation(description = "单个派减")
@SysLog("单个派减")
@PostMapping("/reduceSocialAndFund")
public R<List<ErrorMessage>> reduceSocialAndFund(@RequestBody TDispatchReduceVo excelVOList,
@RequestParam(required = false) String orderId) {
List<TDispatchReduceVo> list = new ArrayList<>();
list.add(excelVOList);
YifuUser user = SecurityUtils.getUser();
List<ErrorMessage> errorMessageList = new ArrayList<>();
tDispatchInfoService.batchReduceDispatch(list, errorMessageList, user, orderId);
return R.ok(errorMessageList);
}
/** /**
* @Author fxj * @Author fxj
* @Description 派单申请批量审核 * @Description 派单申请批量审核
......
...@@ -326,7 +326,6 @@ ...@@ -326,7 +326,6 @@
a.UPDATE_TIME, a.UPDATE_TIME,
a.UPDATE_BY, a.UPDATE_BY,
a.CREATE_NAME, a.CREATE_NAME,
a.BPO_FLAG,
a.CREATE_TIME a.CREATE_TIME
</sql> </sql>
<sql id="tPaymentInfo_where"> <sql id="tPaymentInfo_where">
...@@ -1520,6 +1519,7 @@ ...@@ -1520,6 +1519,7 @@
<!--tPaymentInfo公积金推送查询--> <!--tPaymentInfo公积金推送查询-->
<select id="getTPaymentFundPushInfo" resultMap="tPaymentInfoMap"> <select id="getTPaymentFundPushInfo" resultMap="tPaymentInfoMap">
SELECT SELECT
a.BPO_FLAG,
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
FROM t_payment_info a FROM t_payment_info a
<where> <where>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment