1.其他支出收入单前端对接

2.资金转账单

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/FundtransferController.java

@@ -2,6 +2,8 @@ package com.usoftchina.saas.money.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Fundtran;
 import com.usoftchina.saas.money.po.Fundtransfer;
 import com.usoftchina.saas.money.service.FundtransferService;
@@ -21,26 +23,32 @@ public class FundtransferController {
 
     @RequestMapping("/save")
     public Result insert(@RequestBody Fundtran body) {
-        int id = fundtransferService.insert(body);
-        return Result.success(id);
+        DocBaseDTO docBaseDTO = fundtransferService.insert(body);
+        return Result.success(docBaseDTO);
     }
 
 
-    @PostMapping("/delete")
-    public Result delete(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") int id){
         fundtransferService.delete(id);
         return Result.success();
     }
 
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
+        fundtransferService.deleteItem(id);
+        return Result.success();
+    }
+
 
-    @GetMapping("/read")
-    public Result read(int id){
+    @GetMapping("/read/{id}")
+    public Result read(@PathVariable("id")int id){
         return Result.success(fundtransferService.select(id));
     }
 
-    @GetMapping("/List")
-    public Result getList(PageRequest page){
-        PageInfo<Fundtransfer> list = fundtransferService.selectList(page);
+    @GetMapping("/list")
+    public Result getList(PageRequest page, ListReqDTO condition){
+        PageInfo<Fundtransfer> list = fundtransferService.selectList(page, condition);
         return Result.success(list);
     }
 

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthreceiptsController.java

@@ -28,12 +28,17 @@ public class OthreceiptsController {
     }
 
 
-    @PostMapping("/delete")
-    public Result deletePaybalance(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result deletePaybalance(@PathVariable("id") int id){
         othreceiptsService.delete(id);
         return Result.success();
     }
 
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
+        othreceiptsService.deleteItem(id);
+        return Result.success();
+    }
 
     @GetMapping("/read/{id}")
     public Result getPaybalance(@PathVariable("id")int id){

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/OthspengdingsController.java

@@ -31,14 +31,14 @@ public class OthspengdingsController {
     }
 
 
-    @PostMapping("/delete")
-    public Result deletePaybalance(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result deletePaybalance(@PathVariable("id") int id){
         othspendingsService.delete(id);
         return Result.success();
     }
 
-    @PostMapping("/deleteItem")
-    public Result deleteItem(@RequestBody int id){
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
         othspendingsService.deleteItem(id);
         return Result.success();
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/PaybalanceController.java

@@ -28,18 +28,24 @@ public class PaybalanceController {
     }
 
 
-    @PostMapping("/delete")
-    public Result deletePaybalance(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result deletePaybalance(@PathVariable("id") int id){
         paybalanceService.delete(id);
         return Result.success();
     }
 
-    @PostMapping("/deleteItem/")
-    public Result deleteItem(@RequestBody int id){
+    @PostMapping("/deleteDetail/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
         paybalanceService.deleteItem(id);
         return Result.success();
     }
 
+    @PostMapping("/deleteDetai2/{id}")
+    public Result deleteItems(@PathVariable("id") int id){
+        paybalanceService.deleteItems(id);
+        return Result.success();
+    }
+
     @GetMapping("/read/{id}")
     public Result getPaybalance(@PathVariable("id")int id){
         return Result.success(paybalanceService.select(id));

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/RecbalanceContorller.java

@@ -25,20 +25,20 @@ public class RecbalanceContorller {
         return Result.success(docBaseDTO);
     }
 
-    @PostMapping("/delete")
-    public Result delete(@RequestBody int id){
+    @PostMapping("/delete/{id}")
+    public Result delete(@PathVariable("id") int id){
         recbalanceService.delect(id);
         return Result.success();
     }
 
-    @PostMapping("/deleteItems1")
-    public Result deleteItem(@RequestBody int id){
+    @PostMapping("/deleteDetail1/{id}")
+    public Result deleteItem(@PathVariable("id") int id){
         recbalanceService.deleteItem(id);
         return Result.success();
     }
 
-    @PostMapping("/deleteItems2")
-    public Result deleteItems(@RequestBody int id){
+    @PostMapping("/deleteDetail2/{id}")
+    public Result deleteItems(@PathVariable("id") int id){
         recbalanceService.deleteItems(id);
         return Result.success();
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Paybalance.java

@@ -252,24 +252,4 @@ public class Paybalance extends CommonBaseEntity implements Serializable {
     public void setPb_text5(String pb_text5) {
         this.pb_text5 = pb_text5 == null ? null : pb_text5.trim();
     }
-
-    @Override
-    public void setCreatorId(long creatorId) {
-
-    }
-
-    @Override
-    public void setUpdaterId(long updaterId) {
-
-    }
-
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
-
-    @Override
-    public void setCompanyId(long companyId) {
-
-    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalance.java

@@ -253,23 +253,4 @@ public class Recbalance extends CommonBaseEntity implements Serializable {
         this.rb_text5 = rb_text5 == null ? null : rb_text5.trim();
     }
 
-    @Override
-    public void setCreatorId(long creatorId) {
-
-    }
-
-    @Override
-    public void setUpdaterId(long updaterId) {
-
-    }
-
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
-
-    @Override
-    public void setCompanyId(long companyId) {
-
-    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/po/Recbalancedet.java

@@ -173,23 +173,4 @@ public class Recbalancedet extends CommonBaseEntity implements Serializable{
         this.rd_text5 = rd_text5 == null ? null : rd_text5.trim();
     }
 
-    @Override
-    public void setCreatorId(long creatorId) {
-
-    }
-
-    @Override
-    public void setUpdaterId(long updaterId) {
-
-    }
-
-    @Override
-    public long getCompanyId() {
-        return 0;
-    }
-
-    @Override
-    public void setCompanyId(long companyId) {
-
-    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/FundtransferService.java

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.money.service;
 
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.money.po.Fundtran;
 import com.usoftchina.saas.money.po.Fundtransfer;
 import com.usoftchina.saas.page.PageRequest;
@@ -10,15 +12,16 @@ import com.usoftchina.saas.page.PageRequest;
  * @date 2018/10/25 19:26
  **/
 public interface FundtransferService {
-    int insert(Fundtran fundtran);
+    DocBaseDTO insert(Fundtran fundtran);
 
     void audit(Fundtran fundtran);
 
     void unAudit(int id);
 
     void delete(int id);
+    void deleteItem(int id);
 
     Fundtran select(int id);
 
-    PageInfo<Fundtransfer> selectList(PageRequest page);
+    PageInfo<Fundtransfer> selectList(PageRequest page, ListReqDTO reqDTO);
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/PaybalanceService.java

@@ -23,6 +23,8 @@ public interface PaybalanceService {
 
     void deleteItem(int id);
 
+    void deleteItems(int id);
+
     Pay select(int id);
 
     PageInfo<Paybalance> selectList(PageRequest page, ListReqDTO reqDTO);

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -2,16 +2,25 @@ package com.usoftchina.saas.money.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.commons.api.MaxnumberService;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.exception.BizExceptionCode;
+import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.money.mapper.FundtransferMapper;
 import com.usoftchina.saas.money.mapper.FundtransferdetailMapper;
 import com.usoftchina.saas.money.po.Fundtran;
 import com.usoftchina.saas.money.po.Fundtransfer;
 import com.usoftchina.saas.money.po.Fundtransferdetail;
+import com.usoftchina.saas.money.po.Paybalance;
 import com.usoftchina.saas.money.service.FundtransferService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.Iterator;
 import java.util.List;
@@ -26,34 +35,55 @@ public class FundtransferServiceImpl implements FundtransferService {
     private FundtransferMapper fundtransferMapper;
     @Autowired
     private FundtransferdetailMapper fundtransferdetailMapper;
+    @Autowired
+    private MaxnumberService maxnumberService;
 
     @Override
-    public int insert(Fundtran fundtran) {
+    public DocBaseDTO insert(Fundtran fundtran) {
         Fundtransfer fundtransfer = fundtran.getMain();
         List<Fundtransferdetail> fundtransferdetails = fundtran.getItems();
 
+        String ft_code = fundtransfer.getFt_code();
+
+        //编号校验
+        ft_code = pushMaxnubmer(ft_code, fundtransfer.getId());
+
+        System.out.println("ft_code" + ft_code);
+        //单号赋值
+        fundtransfer.setFt_code(ft_code);
+
+        Long id = fundtransfer.getId();
+
         if (fundtransfer.getId() > 0){
             fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
         }else {
-            fundtransferMapper.insert(fundtransfer);
+            fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
+            fundtransferMapper.insertSelective(fundtransfer);
+            id = fundtransfer.getId();
         }
 
         Iterator isdet = fundtransferdetails.iterator();
         while (isdet.hasNext()){
             Fundtransferdetail fundtransferdetail= (Fundtransferdetail) isdet.next();
-            if (fundtransferdetail.getFtdId() > 0 ){
+            fundtransfer.setCompanyId(BaseContextHolder.getCompanyId());
+            fundtransferdetail.setFtd_ftid(Math.toIntExact(id));
+            if (fundtransferdetail.getId() > 0 ){
                 fundtransferdetailMapper.updateByPrimaryKey(fundtransferdetail);
             }else {
                 fundtransferdetailMapper.insertSelective(fundtransferdetail);
             }
         }
-        return 0;
+        return new DocBaseDTO(id, ft_code, BillCodeSeq.FUNDTRANSFER.getCaller());
     }
 
     @Override
     public void audit(Fundtran fundtran) {
+        Long companyId = BaseContextHolder.getCompanyId();
         int id = Math.toIntExact(fundtran.getMain().getId());
         Fundtransfer fundtransfer = fundtransferMapper.selectByPrimaryKey(id);
+        fundtransfer.setFt_status(Status.AUDITED.getDisplay());
+        fundtransfer.setFt_statuscode(Status.AUDITED.name());
+        fundtransfer.setCompanyId(companyId);
         if ( fundtransfer == null || "".equals(fundtransfer)){
             this.insert(fundtran);
         }else {
@@ -85,12 +115,12 @@ public class FundtransferServiceImpl implements FundtransferService {
     public Fundtran select(int id) {
         Fundtran fundtran = new Fundtran();
         fundtran.setMain(fundtransferMapper.selectByPrimaryKey(id));
-        fundtran.setItems((List<Fundtransferdetail>) fundtransferdetailMapper.selectByPrimaryKey(id));
+        fundtran.setItems(fundtransferdetailMapper.selectByPrimaryKey(id));
         return fundtran;
     }
 
     @Override
-    public PageInfo<Fundtransfer> selectList(PageRequest page) {
+    public PageInfo<Fundtransfer> selectList(PageRequest page, ListReqDTO reqDTO) {
         //设置默认分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -98,9 +128,44 @@ public class FundtransferServiceImpl implements FundtransferService {
             page.setSize(10);
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
-        List<Fundtransfer> fundtransfers = fundtransferMapper.selectList();
+        List<Fundtransfer> fundtransfers = this.getListByMode(reqDTO);
         //取分页信息
         PageInfo<Fundtransfer> pageInfo = new PageInfo<>(fundtransfers);
         return pageInfo;
     }
+
+    /**
+     * @Description: 检验获取并更新单号
+     * @Param: [code, id]
+     * @return: java.lang.String
+     * @Author: guq
+     * @Date: 2018/10/19
+     */
+    private String pushMaxnubmer(String code, Long id) {
+        if (null == code) {
+            throw new BizException(BizExceptionCode.NULL_CODE);
+        }
+        Long companyId = BaseContextHolder.getCompanyId();
+        Integer count = "0".equals(String.valueOf(id)) ? fundtransferMapper.validateCodeWhenInsert(code, companyId) :
+                fundtransferMapper.validateCodeWhenUpdate(code, id, companyId);
+        return maxnumberService.pushMaxnubmer(count, code, BillCodeSeq.FUNDTRANSFER.getCaller()).getData();
+    }
+
+    private List<Fundtransfer> getListByMode(ListReqDTO req) {
+        List<Fundtransfer> fundtransferList = null;
+        Long companyId = BaseContextHolder.getCompanyId();
+        if (StringUtils.isEmpty(req)) {
+            return  null;
+        }
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
+        if (StringUtils.isEmpty(req.getMode()) || "MAIN".equals(req.getMode())) {
+            fundtransferList = fundtransferMapper.selectFundtransferBycondition(con, companyId);
+        } else {
+            fundtransferList = fundtransferMapper.selectFundtransferListByCondition(con, companyId);
+        }
+        return fundtransferList;
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -121,10 +121,14 @@ public class PaybalanceServiceImpl implements PaybalanceService {
 
     @Override
     public void deleteItem(int id) {
-        paybalancedetailMapper.deleteItem(id);
         paybalancedetMapper.deleteItem(id);
     }
 
+    @Override
+    public void deleteItems(int id) {
+        paybalancedetailMapper.deleteItem(id);
+    }
+
     public Pay select(int id){
         Pay pay = new Pay();
         pay.setMain(paybalanceMapper.selectByPrimaryKey(id));

applications/money/money-server/src/main/resources/mapper/OthreceiptsdetailMapper.xml

@@ -55,6 +55,9 @@
   <insert id="insertSelective" parameterType="com.usoftchina.saas.money.po.Othreceiptsdetail" >
     insert into othreceiptsdetail
     <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="ord_orid != null" >
+        ord_orid,
+      </if>
       <if test="ord_detno != null" >
         ord_detno,
       </if>
@@ -96,6 +99,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="ord_orid != null" >
+        #{ord_orid,jdbcType=INTEGER},
+      </if>
       <if test="ord_detno != null" >
         #{ord_detno,jdbcType=INTEGER},
       </if>