手工签收

release
yishiqihuasheng 2 years ago
parent 7de4619e78
commit 81f558bcc1
  1. 33
      dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java
  2. 4
      dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java
  3. 15
      dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml

@ -75,16 +75,28 @@ public class SignFpqsController extends AbstractController {
public ResponseEntity<?> listWqsfp(@RequestBody Map<String, Object> pramsMap) { public ResponseEntity<?> listWqsfp(@RequestBody Map<String, Object> pramsMap) {
// 入参统一在入口处理 // 入参统一在入口处理
pramsMap.put("dbName", getUserInfo().getDbName()); pramsMap.put("dbName", getUserInfo().getDbName());
List<String> gfshList = new ArrayList<>(); // List<String> gfshList = new ArrayList<>();
if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) { // if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
gfshList.add(pramsMap.get("gfsh").toString()); // gfshList.add(pramsMap.get("gfsh").toString());
} else { // } else {
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg()); // gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
if (gfshList.size() == 0) { // if (gfshList.size() == 0) {
return ResponseEntity.ok(R.ok().put("data", "")); // return ResponseEntity.ok(R.ok().put("data", ""));
} // }
} // }
pramsMap.put("gfsh", gfshList); if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
return ResponseEntity.ok(R.error("购方税号不能为空"));
}
String gfsh = (String) pramsMap.get("gfsh");
// gfshList.add(gfsh);
pramsMap.put("gfsh", gfsh);
if (pramsMap.get("companyCode") == null || "".equals(pramsMap.get("companyCode"))){
return ResponseEntity.ok(R.error("组织编码不能为空"));
}
String companyCode = (String) pramsMap.get("companyCode");
pramsMap.put("companyCode",companyCode);
if (pramsMap.get("kprqq") != null && !"".equals(pramsMap.get("kprqq"))) { if (pramsMap.get("kprqq") != null && !"".equals(pramsMap.get("kprqq"))) {
pramsMap.put("kprqq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kprqq").toString()))); pramsMap.put("kprqq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kprqq").toString())));
} else { } else {
@ -111,7 +123,6 @@ public class SignFpqsController extends AbstractController {
pramsMap.put("invoiceSource",pramsMap.get("invoiceSource")); pramsMap.put("invoiceSource",pramsMap.get("invoiceSource"));
int curr = (int)pramsMap.get("curr"); int curr = (int)pramsMap.get("curr");
int size = (int)pramsMap.get("size"); int size = (int)pramsMap.get("size");
try { try {
if(pramsMap.get("emailAddress") == null){ if(pramsMap.get("emailAddress") == null){
return ResponseEntity.ok(R.ok().put("data", signFpqsService.selectWqsfp(pramsMap, curr, size))); return ResponseEntity.ok(R.ok().put("data", signFpqsService.selectWqsfp(pramsMap, curr, size)));

@ -144,9 +144,9 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao,
String menuId = (String)pramsMap.get("menuId"); String menuId = (String)pramsMap.get("menuId");
JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId); JSONObject json = tabulateRedisService.getTabulateMenu(company, menuId);
List<String> gfshList = (List<String>)pramsMap.get("gfsh"); String gfsh = (String) pramsMap.get("gfsh");
if (gfshList.size() == 0) { if (StringUtils.isBlank(gfsh)) {
// 未从getUserInfo()获取到购方税号信息 // 未从getUserInfo()获取到购方税号信息
json.put("hjsl", "0"); json.put("hjsl", "0");
json.put("hjje", "0"); json.put("hjje", "0");

@ -30,11 +30,11 @@
resultMap="BaseResultMap" databaseId="mysql"> resultMap="BaseResultMap" databaseId="mysql">
select select
t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.ele_invoice_no,t.invoice_date,t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status t.id,t.invoice_type,t.invoice_code,t.invoice_no,t.ele_invoice_no,t.invoice_date,t.gf_name,t.xf_name,t.invoice_amount,t.tax_amount,t.dept_id,t.qs_status
,
from t_dx_record_invoice t from t_dx_record_invoice t
where t.company = #{company} and t.gf_tax_no in where t.company = #{company}
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")"> and t.gf_tax_no = #{gfsh}
#{item} and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
</foreach>
and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
<if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '14' "> <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '14' ">
and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') ) and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') )
@ -128,10 +128,9 @@
resultMap="WqshjResultMap" databaseId="mysql"> resultMap="WqshjResultMap" databaseId="mysql">
select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse select count(1) hjsl,sum(t.invoice_amount)hjje,sum(t.tax_amount)hjse
from t_dx_record_invoice t from t_dx_record_invoice t
where t.company = #{company} and t.gf_tax_no in where t.company = #{company}
<foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")"> and t.gf_tax_no = #{gfsh}
#{item} and (t.comp_code = #{companyCode} or t.comp_code = '' or t.comp_code is null)
</foreach>
and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08')) and (t.invoice_type in('01','03','08','14','31','283','161','183','185') or (t.invoice_type ='32' and t.lq_tdyslxDm='08'))
<if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '14' "> <if test="invoiceType != null and invoiceType != '' and invoiceType != 'null' and invoiceType == '14' ">
and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') ) and (t.invoice_type = '14' or (t.invoice_type = '32' and t.lq_tdyslxDm='08') )

Loading…
Cancel
Save