Parcourir la source

新增报销查询编号字段。
新增、详情、修改、列表修改。
新增根据报销查询编号查询接口。

anderx il y a 2 ans
Parent
commit
71bd7c7e78

+ 38 - 55
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -1,36 +1,31 @@
 package com.goafanti.common.controller;
 
-import java.io.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.goafanti.admin.service.AdminService;
+import com.goafanti.admin.service.AttachmentService;
+import com.goafanti.common.bo.Error;
+import com.goafanti.common.bo.OutUser;
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.TOrderMidMapper;
-import com.goafanti.common.dao.TOrderTaskMapper;
-import com.goafanti.common.model.TOrderMid;
-import com.goafanti.common.model.TOrderTask;
-import com.goafanti.common.utils.excel.Excel;
-import com.goafanti.common.utils.pdf.PDFUtils;
-import com.goafanti.common.utils.word.WordUtils;
-import com.goafanti.order.bo.TOrderTaskBo;
-import com.goafanti.order.enums.NewProjectStatus;
+import com.goafanti.common.enums.UserType;
+import com.goafanti.common.model.User;
+import com.goafanti.common.service.DistrictGlossoryService;
+import com.goafanti.common.service.IndustryCategoryService;
+import com.goafanti.common.utils.*;
+import com.goafanti.common.utils.excel.FileUtils;
+import com.goafanti.common.utils.excel.NewExcelUtil;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.core.websocket.SystemWebSocketHandler;
+import com.goafanti.expenseAccount.service.ExpenseAccountService;
 import com.goafanti.order.enums.OrderImgEnums;
-import com.goafanti.order.enums.ProjectStage;
-import com.goafanti.order.enums.ProjectType;
-import com.goafanti.order.service.OrderProjectService;
+import com.goafanti.user.service.UserService;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -44,31 +39,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.socket.TextMessage;
 
-import com.goafanti.admin.service.AdminService;
-import com.goafanti.admin.service.AttachmentService;
-import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.OutUser;
-import com.goafanti.common.bo.Result;
-import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.enums.UserType;
-import com.goafanti.common.model.User;
-import com.goafanti.common.service.DistrictGlossoryService;
-import com.goafanti.common.service.FieldGlossoryService;
-import com.goafanti.common.service.IndustryCategoryService;
-import com.goafanti.common.utils.DateUtils;
-import com.goafanti.common.utils.LoggerUtils;
-import com.goafanti.common.utils.MobileMessageUtils;
-import com.goafanti.common.utils.PasswordUtil;
-import com.goafanti.common.utils.PictureUtils;
-import com.goafanti.common.utils.TimeUtils;
-import com.goafanti.common.utils.VerifyCodeUtils;
-import com.goafanti.common.utils.excel.FileUtils;
-import com.goafanti.common.utils.excel.NewExcelUtil;
-import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.core.websocket.SystemWebSocketHandler;
-import com.goafanti.patent.bo.PatentNewBo;
-import com.goafanti.user.service.UserService;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.util.*;
 
 @Controller
 @Scope(value = "prototype")
@@ -115,7 +90,7 @@ public class PublicController extends CertifyApiController {
 	private DistrictGlossoryService	districtGlossoryService;
 
 	@Autowired
-	private OrderProjectService	orderProjectService;
+	private ExpenseAccountService	expenseAccountService;
 
 	@Value(value = "${patentTemplate}")
 	private String					patentTemplate		= null;
@@ -780,10 +755,18 @@ public class PublicController extends CertifyApiController {
 			return res;
           }
 
-          @RequestMapping("/getUser")
-          public Result getUser() {
-        	  List<OutUser> list=userService.getuser();
-        	  NewExcelUtil<OutUser> excel=new NewExcelUtil<OutUser>(OutUser.class);
-      		return excel.exportExcel(list, "客户列表",uploadPath);
-          }
+	@RequestMapping("/getUser")
+	public Result getUser() {
+		List<OutUser> list=userService.getuser();
+		NewExcelUtil<OutUser> excel=new NewExcelUtil<OutUser>(OutUser.class);
+		return excel.exportExcel(list, "客户列表",uploadPath);
+	}
+
+
+	@RequestMapping("/supplementCheckNo")
+	public Result supplementCheckNo() {
+		Result res=new Result();
+		res.data(expenseAccountService.pushSupplementCheckNo());
+		return res;
+	}
 }

+ 5 - 0
src/main/java/com/goafanti/common/dao/ExpenseAccountMapper.java

@@ -25,6 +25,8 @@ public interface ExpenseAccountMapper {
 
     OutExpenseAccount selectByaidAndPrid(InputExpenseAccount in);
 
+    OutExpenseAccount selectByCheckNo(String checkNo);
+
     List<OutExpenseAccount> selectByaidAndType(@Param("aid") String aid,@Param("depId")String depId, @Param("type")Integer type,
                                                @Param("id")Integer id);
 
@@ -34,4 +36,7 @@ public interface ExpenseAccountMapper {
     List<ExpenseAccount> selectByDebitId(Integer debitId);
 
 
+    List<ExpenseAccount> selectByCheckNoNot();
+
+
 }

+ 19 - 2
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -350,7 +350,7 @@
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
         a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
         c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,
-        a.liquidation_status liquidationStatus, a.remarks,
+        a.liquidation_status liquidationStatus, a.remarks,a.check_no checkNo,
            date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
             date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
             date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
@@ -364,6 +364,15 @@
     WHERE a.id= #{id}
   </select>
 
+  <select id="selectByCheckNo" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
+    SELECT
+    <include refid="selectDtailsSql"/>
+    FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
+    left join expense_account_private d on a.eaaid=d.id left join t_order_new o on a.order_no =o.order_no
+    left join t_order_mid tm on a.order_no =tm.order_no
+    WHERE a.check_no= #{checkNo}
+  </select>
+
 
   <select id="selectExpenseAccountList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountBo">
     select a.id,a.total_amount totalAmount,a.`type`,a.process_status processStatus,a.status,a.examine_name examineName,a.type_other typeOther,
@@ -557,13 +566,15 @@
     WHERE a.status= #{status}
     and a.prid= #{prid} and a.aid = #{aid}
   </select>
+
+
     <select id="selectByaidAndType" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccount">
       SELECT
         a.id, a.prid, a.order_no orderNo, o.contract_no contractNo ,tm.buyer_name buyerName, a.aid, a.aname, a.`type`,
         a.type_other typeOther , a.status,a.process_status processStatus,a.total_amount totalAmount,a.debit_id debitId,
         a.attachment_url attachmentUrl,a.apply_dep applyDep, a.pay_dep payDep, a.eaaid,a.district_name districtName,
         a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name appDepName,
-        c.name payDepName,d.name ,d.bank ,d.accounts ,t0.amount settlementAmount,
+        c.name payDepName,d.name ,d.bank ,d.accounts ,t0.amount settlementAmount,a.check_no checkNo,
         a.liquidation_status liquidationStatus, a.remarks,
         date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
         date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
@@ -599,5 +610,11 @@
     from expense_account
     where debit_id = #{debitId}
   </select>
+  <select id="selectByCheckNoNot" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  select
+  <include refid="Base_Column_List" />
+  from expense_account
+    where check_no =''
+  </select>
 
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -118,6 +118,18 @@ public class ExpenseAccountController extends CertifyApiController {
         return res;
     }
 
+    /**
+     * 报销列表
+     * @param checkNo
+     * @return
+     */
+    @RequestMapping(value = "/selectByCheckNo",method = RequestMethod.GET)
+    public Result selectByCheckNo(String checkNo ){
+        Result res =new Result();
+        res.setData(expenseAccountService.selectByCheckNo(checkNo));
+        return res;
+    }
+
 
 
 

+ 4 - 0
src/main/java/com/goafanti/expenseAccount/service/ExpenseAccountService.java

@@ -35,4 +35,8 @@ public interface ExpenseAccountService {
 
 
     void statisticsEvict(String name, String depId, String startTime, String endTime);
+
+    Object pushSupplementCheckNo();
+
+    Object selectByCheckNo(String checkNo);
 }

+ 21 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -560,6 +560,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         return useEa;
     }
 
+
+    @Override
+    public Object selectByCheckNo(String checkNo) {
+        OutExpenseAccount useEa = expenseAccountMapper.selectByCheckNo(checkNo);
+        return useEa;
+    }
+
     /**
      * 计算当前报销显示抵扣金额
      * @param useEa
@@ -767,6 +774,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         LoggerUtils.debug(getClass(), "报销统计清楚缓存。");
     }
 
+    @Override
+    public Object pushSupplementCheckNo() {
+        List<ExpenseAccount> list = expenseAccountMapper.selectByCheckNoNot();
+        if (!list.isEmpty()){
+            list.forEach(e ->{
+                ExpenseAccount ea=new ExpenseAccount();
+                ea.setId(e.getId());
+                ea.setCheckNo(idGenerator.getNOgenerateId());
+                expenseAccountMapper.updateByPrimaryKeySelective(ea);
+            });
+            return 1;
+        }
+        return 0;
+    }