anderx лет назад: 2
Родитель
Сommit
504ff1883c

+ 6 - 0
src/main/java/com/goafanti/common/mapper/ExpenseAccountPrivateMapper.xml

@@ -144,6 +144,9 @@
     <include refid="selectDetails" />
     from expense_account_private
     where aid = #{aid}
+    <if test="status != null">
+     and status= #{status}
+    </if>
     order by create_time desc
     <if test="page_sql !=null">
       ${page_sql}
@@ -153,6 +156,9 @@
     select count(*)
     from expense_account_private
     where aid = #{aid}
+    <if test="status != null">
+      and status= #{status}
+    </if>
   </select>
     <select id="selectByAccount" resultType="com.goafanti.common.model.ExpenseAccountPrivate">
       select

+ 2 - 2
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountPrivateController.java

@@ -84,9 +84,9 @@ public class ExpenseAccountPrivateController extends CertifyApiController {
      * @return
      */
     @RequestMapping(value = "/selectList",method = RequestMethod.GET)
-    public Result selectList(Integer pageSize,Integer pageNo){
+    public Result selectList(Integer status,Integer pageSize,Integer pageNo){
         Result res =new Result();
-        res.setData(expenseAccountPrivateService.selectList(pageSize,pageNo));
+        res.setData(expenseAccountPrivateService.selectList(status,pageSize,pageNo));
         return res;
     }
 

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountPrivateService.java

@@ -7,7 +7,7 @@ import com.goafanti.expenseAccount.bo.OutExpenseAccountPrivate;
 public interface ExpenseAccountPrivateService {
     ExpenseAccountPrivate add(InputExpenseAccountPrivate in);
 
-    Object selectList(Integer pageSize, Integer pageNo);
+    Object selectList(Integer status,Integer pageSize, Integer pageNo);
 
 
     int update(InputExpenseAccountPrivate in);

+ 2 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountPrivateServiceImpl.java

@@ -51,10 +51,11 @@ public class ExpenseAccountPrivateServiceImpl extends BaseMybatisDao<ExpenseAcco
     }
 
     @Override
-    public Object selectList(Integer pageSize, Integer pageNo) {
+    public Object selectList(Integer status,Integer pageSize, Integer pageNo) {
         String aid=TokenManager.getAdminId();
         Map<String,Object> params=new HashMap<>();
         params.put("aid",aid);
+        if (status!=null)params.put("status",status);
         Pagination<?> page = findPage("selectExpenseAccountPrivateList", "selectExpenseAccountPrivateCount", params, pageNo, pageSize);
         return page;
     }

+ 5 - 2
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -109,8 +109,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             in.setReleaseStart(DateUtils.StringToDate(in.getStartTimeStr(), AFTConstants.YYYYMMDDHHMMSS));
             in.setReleaseEnd(DateUtils.StringToDate(in.getEndTimeStr(), AFTConstants.YYYYMMDDHHMMSS));
         }
-        in.setStatus(1);
-        in.setProcessStatus(1);
+        if(in.getStatus()==1){
+            in.setProcessStatus(1);
+        }
+
+
         //计算总金额
         in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
         if (useEA.getStatus()==0){