update

mec-biz/src/main/resources/config/mybatis/FinancialExpenditureMapper.xml

@@ -113,6 +113,10 @@
             <if test="dingtalkProcessNo != null and dingtalkProcessNo != ''">
                 AND fe.dingtalk_process_no_ = #{dingtalkProcessNo}
             </if>
+            <if test="search != null and search != ''">
+                AND (fe.batch_no_ LIKE CONCAT('%',#{search},'%') OR fe.financial_process_no_ LIKE CONCAT('%',#{search},'%')
+                OR fe.dingtalk_process_no_ LIKE CONCAT('%',#{search},'%') OR su.real_name_ LIKE CONCAT('%',#{search},'%'))
+            </if>
             <if test="organId != null">
                 AND fe.organ_id_ = #{organId}
             </if>
@@ -145,6 +149,7 @@
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
 		SELECT COUNT(DISTINCT fe.id_) FROM financial_expenditure fe
+        LEFT JOIN sys_user su ON su.id_ = fe.apply_user_id_
         <include refid="queryPageSql"/>
 	</select>
 
@@ -156,6 +161,7 @@
 
     <select id="findFinancialExpenditureCount" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT fe.id_) FROM financial_expenditure fe
+        LEFT JOIN sys_user su ON su.id_ = fe.apply_user_id_
         <include refid="queryPageSql"/>
     </select>
     <select id="queryFinancialExpenditurePage" resultMap="FinancialExpenditureDto">

mec-web/src/main/java/com/ym/mec/web/controller/FinancialExpenditureController.java

@@ -20,14 +20,6 @@ public class FinancialExpenditureController extends BaseController {
     @Autowired
     private FinancialExpenditureService financialExpenditureService;
 
-    @ApiOperation(value = "修改财务支出")
-    @PostMapping("/update")
-    @PreAuthorize("@pcs.hasPermissions('financialExpenditure/update')")
-    public Object upSet(@RequestBody FinancialExpenditure financialExpenditure) {
-        financialExpenditureService.update(financialExpenditure);
-        return succeed();
-    }
-
     @ApiOperation(value = "删除财务支出")
     @PostMapping("/batchDel")
     @PreAuthorize("@pcs.hasPermissions('financialExpenditure/batchDel')")