完成阶段需求

WebRoot/WEB-INF/pages/account/accountBank/AccountBank_ConfirmDealPending.jsp

@@ -102,7 +102,8 @@
                 success: function (data) {
                     if (data.result) {
                     	$('#win').window('close');
-                        $.messager.alert('提示', '办理成功！', "info", function(){
+						var tip = ${flag}
+                        $.messager.alert('提示', data.msg, "info", function(){
                             var leftTab=top.getTab("财务确认");
                             leftTab.find("iframe")[0].contentWindow.eval("reloadDate()");
                             top.closeCurrTab();

WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp

@@ -248,7 +248,7 @@
 							<tr>
 								<td colspan="4" align="center" style="position: relative;top: 20px;">
 									<a href="###" class="btn_01" onclick="tijiao()" >提交<b></b></a>&nbsp;
-									<c:if test="${'edit' == flag}">
+									<c:if test="${'edit' == flag && fstzsXm.zdsc != 1}">
 										<a href="###" class="btn_01" onclick="shanchu()" >删除<b></b></a>&nbsp;
 									</c:if>
 

WebRoot/WEB-INF/pages/fstzs/Fstzs_View.jsp

@@ -248,6 +248,16 @@
 							</tr>
 						</table>
 					</c:if>
+
+					<c:if test="${fstzsXm.status == 2}">
+						<table width="100%" border="0" class="fu-advice">
+							<tr>
+								<td colspan="4" align="center" style="position: relative;top: 20px;">
+									<a href="###" class="btn_01" onclick="review(1);" >退回<b></b></a>&nbsp;
+								</td>
+							</tr>
+						</table>
+					</c:if>
 			</div>
 			</form>
 		</div>

WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjh.jsp

@@ -113,7 +113,12 @@
 								if(rec.status == 1) {//未缴款的可作废
 									result += "<a class='btn_01_mini' onclick=zuofei('"+rec.slbh+"','"+rec.length+"','"+rec.jkm+"') >作废<b></b></a>";
 								}
+								if(rec.status == 2) {
+									result += "<a class='btn_01_mini' style='opacity: 0.5' >打印<b></b></a>";
+								} else {
 									result += "<a class='btn_01_mini' onclick=dayin('"+rec.id+"') >打印<b></b></a>";
+								}
+
 								return result;
 							}},
 				          	{field:'jkm',title:'缴款码',width:200},

WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp

@@ -98,6 +98,9 @@
 						var result = "";
 						if(rec.status == 3 || rec.status == 4) {//复核不通过、退回时
 							result += "<a class='btn_01_mini' onclick=edit('"+rec.id+"') >修改<b></b></a>";
+						} else if(rec.zdsc == 1){
+							result += "<a class='btn_01_mini' onclick=edit('"+rec.id+"') >修改<b></b></a>";
+							result += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
 						} else {
 							result += "<a class='btn_01_mini' onclick=view('"+rec.id+"') >查看<b></b></a>";
 						}

activiti/com/jshx/activiti/listener/AssigneeListener.java

@@ -50,7 +50,7 @@ public class AssigneeListener extends AbstractListener implements TaskListener {
             String taskCandidateGroup = identityLink.getGroupId();
             if (StringUtils.isNoneBlank(taskCandidateGroup)) {
                 if (taskCandidateGroup.indexOf(CREATOR_DEPT) != -1) {
-                    User user = userService.findUserByLoginId(creator);
+                    User user = userService.findUserById(creator);
                     taskCandidateGroup = taskCandidateGroup.replace(CREATOR_DEPT, user.getDeptCode());
                     delegateTask.addCandidateGroup(taskCandidateGroup);
                 }

activiti/com/jshx/activiti/web/ActivitiControllerAction.java

@@ -25,6 +25,7 @@ import com.jshx.core.utils.SpringContextHolder;
 import com.jshx.core.utils.StringUtil;
 import com.jshx.dxpz.entity.Dxpz;
 import com.jshx.dxpz.service.DxpzService;
+import com.jshx.fstzs.service.FstzsXmService;
 import com.jshx.jkmx.entity.Jkmx;
 import com.jshx.jkmx.service.JkmxService;
 import com.jshx.jktzs.entity.Jktzs;
@@ -173,6 +174,9 @@ public class ActivitiControllerAction extends BaseAction {
 		private CktzsService cktzsService;
 	    @Autowired
 		private JktzsService jktzsService;
+
+        @Autowired
+        private FstzsXmService fstzsXmService;
 	    @Autowired
 		private ZsdwService zsdwService;
 	    @Autowired
@@ -1202,11 +1206,13 @@ public class ActivitiControllerAction extends BaseAction {
 	         		if(null!=lis&&lis.size()>0){
 	         			for (PaymentItemPending asd : lis) {
 	         				paymentItemPendingService.delete(asd.getId());
+
 						}
 	         		 }
 	         		if(null!=jktzs&&jktzs.size()>0){
 	         			for (Jktzs jktbean : jktzs) {
 	         				jktzsService.deleteWithFlag(jktbean.getId());
+                            fstzsXmService.deleteWithFlagBySlbh(jktbean.getSlbh());
 						}
 	         			
 	         		}

src/com/jshx/account/accountBank/web/AccountBankAction.java

 package com.jshx.account.accountBank.web;
 
 import com.jshx.core.base.dao.BaseDao;
+import com.jshx.fstzs.entity.Fstzs;
+import com.jshx.fstzs.entity.FstzsXm;
+import com.jshx.fstzs.service.FstzsService;
+import com.jshx.fstzs.service.FstzsXmService;
 import com.jshx.module.admin.service.UserRoleService;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -102,6 +106,12 @@ public class AccountBankAction extends BaseAction
 	@Autowired
 	private AccountBankService accountBankService;
 
+	@Autowired
+	private FstzsXmService fstzsXmService;
+
+	@Autowired
+	private FstzsService fstzsService;
+	
 	@Autowired
 	private AccountBankAttachService accountBankAttachService;
 	
@@ -411,10 +421,44 @@ public class AccountBankAction extends BaseAction
     			    if(orderId!=null && !orderId.trim().equals(""))
     			    {
     			    	accountBankService.accountConfirmPending(orderId, ids, outcome, this.getLoginUser().getId(), identityService, runtimeService);
+
+						/**
+						 * 办理时，直接生成非税通知书，不需要另外操作了
+						 */
+						if(!"1".equals(flag)) {
+							PaymentItemPending paymentItemPending = paymentItemPendingService.getById(orderId);
+							FstzsXm fstzsXm = fstzsXmService.getBySlbh(paymentItemPending.getSlbh());
+							if(fstzsXm != null) {
+								fstzsXm.setStatus(1);
+								fstzsXm.setZdsc(1);
+								fstzsXm.setJbr(this.getLoginUser().getDisplayName());
+								fstzsXm.setJsdwmc(paymentItemPending.getDwmc());
+								fstzsXm.setBeizhu(fstzsXm.getSlbh() + "，共1张电子发票");
+
+								Fstzs f = new Fstzs();
+								f.setJkr(fstzsXm.getJsdwmc());
+								f.setYjje(fstzsXm.getYjje());
+								f.setYjmj(fstzsXm.getXmxxb().getCsmj());
+								f.setDelFlag(0);
+								f.setStatus(0);
+								f.setFstzsXm(fstzsXm);
+								f.setGcxmmc(fstzsXm.getGcxmmc());
+								f.setJsdwmc(fstzsXm.getJsdwmc());
+								f.setSlbh(fstzsXm.getSlbh());
+								f.setLength(1);
+								f.setIsJk(0);
+								f.setKpState(0);
+
+								fstzsXmService.update(fstzsXm);
+								fstzsService.save(f);
+
 							}
 						}
+
 					}
-        	this.getResponse().getWriter().println("{\"result\":true}");
+    			}
+    		}
+        	this.getResponse().getWriter().println("{\"result\":true,\"msg\":\"" + ("1".equals(flag) ? "办理成功！" : "办理成功！，已生成非税通知书") + "\"}");
         }catch (Exception e) {
         	logger.error(e.getMessage());
         	this.getResponse().getWriter().println("{\"result\":false}");

src/com/jshx/fstzs/entity/FstzsXm.java

@@ -121,6 +121,11 @@ public class FstzsXm extends BaseModel
 	 */
 	private Integer isJx;
 
+	/**
+	 * 一般项目办理时，自动生成的
+	 */
+	private Integer zdsc;
+
 
 	public Integer getStatus() {
 		return status;
@@ -271,4 +276,12 @@ public class FstzsXm extends BaseModel
 	public void setIsJx(Integer isJx) {
 		this.isJx = isJx;
 	}
+
+	public Integer getZdsc() {
+		return zdsc;
+	}
+
+	public void setZdsc(Integer zdsc) {
+		this.zdsc = zdsc;
+	}
 }

src/com/jshx/fstzs/service/FstzsXmService.java

@@ -57,4 +57,6 @@ public interface FstzsXmService extends BaseService
 	 */
 	public void deleteWithFlag(String ids);
 
+	public void deleteWithFlagBySlbh(String slbh);
+
 }

src/com/jshx/fstzs/service/impl/FstzsXmServiceImpl.java

@@ -116,4 +116,15 @@ public class FstzsXmServiceImpl extends BaseServiceImpl implements FstzsXmServic
 			}
 		}
 	}
+
+
+	@Transactional
+	public void deleteWithFlagBySlbh(String slbh)
+	{
+		FstzsXm fstzsXm = getBySlbh(slbh);
+		if(fstzsXm != null)
+			deleteWithFlag(fstzsXm.getId());
+	}
+
+
 }

src/com/jshx/fstzs/web/FstzsAction.java

@@ -314,6 +314,7 @@ public class FstzsAction extends BaseAction {
         //更新数据库项目状态
         dbXm.setJsdwmc(fstzsXm.getJsdwmc());
         dbXm.setStatus(1);//状态改为已生成、待复核
+        dbXm.setZdsc(0);
         dbXm.setJbr(this.getLoginUser().getDisplayName());
         dbXm.setBeizhu(fstzsXm.getBeizhu());
         dbXm.setKhh(fstzsXm.getKhh());
@@ -383,7 +384,7 @@ public class FstzsAction extends BaseAction {
                     params.put("slbh",fstzsXm.getSlbh());
                     List<Fstzs> list = fstzsService.findList(params);
                     if(list != null && list.size() > 0) {
-                        List<String> ids = list.stream().map(f -> f.getId()).collect(Collectors.toList());
+                        List<String> ids = list.stream().filter(i-> i.getStatus() == 0).map(f -> f.getId()).collect(Collectors.toList());
                         fstzsService.delete(ids);
                     }
 
@@ -532,8 +533,19 @@ public class FstzsAction extends BaseAction {
         boolean result = true;
         String message = "操作成功";
 
+
+
         Fstzs fstzs = fstzsService.getById(id);
         FstzsXm xm = fstzsXmService.getBySlbh(fstzs.getSlbh());
+
+        PaymentItemHis paymentItemHis = paymentItemHisService.getByXmbId(xm.getXmxxb().getId());
+        if(paymentItemHis == null) {
+            result = false;
+            message = "请先确认财务到账再开票";
+            this.getResponse().getWriter().println("{\"result\":"+result+",\"message\":\"" + message + "!"+"\"}");
+            return;
+        }
+
         String jbr = this.getLoginUser().getDisplayName();
         fstzs.setFstzsXm(xm);
         FsResult<String> kaipiao = FsRequest.kaipiao(fstzs, jbr);
@@ -661,7 +673,7 @@ public class FstzsAction extends BaseAction {
 
         //未开票
         List<Fstzs> wkp = fsList.stream().filter(i -> i.getKpState() == null || i.getKpState() == 0).collect(Collectors.toList());
-        if(wkp != null && wkp.size() > 0) return;//有人开票，不处理
+        if(wkp != null && wkp.size() > 0) return;//有人未开票，不处理
 
         try {
             uploadVoucherInfotb(xm,fsList);
@@ -704,10 +716,6 @@ public class FstzsAction extends BaseAction {
         PaymentItemHis byXmbId = paymentItemHisService.getByXmbId(xm.getXmxxb().getId());
         //四位全局校验码
         for(Fstzs f : fstzsList) {
-            BigDecimal areaBd = new BigDecimal(paymentVoucherHis.getArea());
-            String area = areaBd.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
-            BigDecimal amountBd = new BigDecimal(paymentVoucherHis.getAmount());
-            String amount = amountBd.setScale(2, BigDecimal.ROUND_HALF_UP).toString();
 
             paymentVoucherHis.setAmount(f.getYjje());
             //模拟票据领取发放功能
@@ -764,8 +772,6 @@ public class FstzsAction extends BaseAction {
             //缴销
             Pjjx pjjx = new Pjjx();
 
-            pjjx.setJkr(f.getJkr());
-            pjjx.setJkje(f.getYjje());
             pjjx.setDeptId(this.getLoginUserDepartmentId());
             pjjx.setDelFlag(0);
             pjjx.setPjbm(paymentVoucherHis1.getVoucherCode());

src/com/jshx/fstzs/web/FstzsDsrw.java

@@ -27,8 +27,8 @@ public class FstzsDsrw {
     @Autowired
     FstzsService fstzsService;
 
-    //每天11，12，13点刷新缴费状态
-    @Scheduled(cron = "0 0 11,12,13 * * ?")
+    //每天11，12，13,14,15点刷新缴费状态
+    @Scheduled(cron = "0 0 11,12,13,14,15 * * ?")
     public void queryJfzt() {
         Map<String, Object> paraMap = new HashMap<String, Object>();
         paraMap.put("status",new ArrayList<Integer>(){{

src/com/jshx/jktzs/web/JktzsAction.java

@@ -20,6 +20,8 @@ import com.fr.function.CNMONEY;
 import com.jshx.common.utils.NumberToCN;
 import com.jshx.elicense.entity.ELicense;
 import com.jshx.elicense.service.ELicenseService;
+import com.jshx.fstzs.entity.FstzsXm;
+import com.jshx.fstzs.service.FstzsXmService;
 import com.jshx.xmxxb.entity.Xmxxb;
 import com.jshx.xmxxb.service.XmxxbService;
 import org.apache.commons.lang3.StringUtils;
@@ -93,6 +95,8 @@ public class JktzsAction extends BaseAction
 	@Autowired
 	private JktzsService jktzsService;
 	@Autowired
+	private FstzsXmService fstzsXmService;
+	@Autowired
 	private ZsdwService zsdwService;
 	@Autowired
 	private CktzsService cktzsService;
@@ -470,6 +474,24 @@ public class JktzsAction extends BaseAction
 			jktzs.setDelFlag(0);
 			jktzs.setElFlag("0");
 			jktzsService.save(jktzs);
+
+			/**
+			 * 20221116
+			 * 入paymentItemPending表同时，入FstzsXm表
+			 */
+			if(!"0.00".equals(jktzs.getJfje()))  {
+				FstzsXm xm = new FstzsXm();
+				xm.setXmxxb(xmxxbService.getById(jktzs.getXmbzj()));
+				xm.setDelFlag(0);
+				xm.setStatus(0);
+
+				xm.setJsdwmc(jktzs.getDwmc());
+				xm.setGcxmmc(jktzs.getXmmc());
+				xm.setSlbh(jktzs.getSlbh());
+				xm.setYjje(jktzs.getJfje());
+				fstzsXmService.save(xm);
+			}
+
 		}else{
 			jktzsService.update(jktzs);
 		}
@@ -502,6 +524,18 @@ public class JktzsAction extends BaseAction
 	 */
 	public String delete() throws Exception{
 	    try{
+			String[] idArray = ids.split("\\|");
+			if(null != idArray)
+			{
+				for(String id : idArray)
+				{
+					if(id!=null && !id.trim().equals("")) {
+						Jktzs jktzs1 = jktzsService.getById(id);
+						fstzsXmService.deleteWithFlagBySlbh(jktzs1.getSlbh());
+					}
+
+				}
+			}
 			jktzsService.deleteWithFlag(ids);
 			this.getResponse().getWriter().println("{\"result\":true}");
 		}catch(Exception e){

src/com/jshx/mobile/web/GzlScheduleAction.java

@@ -14,6 +14,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
+import com.jshx.fstzs.service.FstzsXmService;
 import org.activiti.bpmn.model.FlowNode;
 import org.activiti.bpmn.model.UserTask;
 import org.activiti.engine.FormService;
@@ -152,6 +153,8 @@ public class GzlScheduleAction extends BaseAction {
 	@Autowired
 	private JktzsService jktzsService;
 	@Autowired
+	private FstzsXmService fstzsXmService;
+	@Autowired
 	private CjjlbService cjjlbService;
 	 @Autowired()
 	    private ReturnItemService returnItemService;
@@ -2012,6 +2015,7 @@ public class GzlScheduleAction extends BaseAction {
 		         		if(null!=jktzs&&jktzs.size()>0){
 		         			for (Jktzs jktbean : jktzs) {
 		         				jktzsService.deleteWithFlag(jktbean.getId());
+								 fstzsXmService.deleteWithFlagBySlbh(jktbean.getSlbh());
 							}
 		         			
 		         		}

src/com/jshx/paymentItemPending/web/PaymentItemPendingAction.java

@@ -65,9 +65,6 @@ public class PaymentItemPendingAction extends BaseAction
 	private PaymentItemPendingService paymentItemPendingService;
 
 
-	@Autowired
-	private FstzsXmService fstzsXmService;
-	
 	@Autowired
 	private ZsdwService zsdwService;
 
@@ -189,44 +186,8 @@ public class PaymentItemPendingAction extends BaseAction
 			paymentItemPending.setDeptId(this.getLoginUserDepartmentId());
 			paymentItemPending.setDelFlag(0);
 			paymentItemPendingService.save(paymentItemPending);
-			/**
-			 * 20221116
-			 * 入paymentItemPending表同时，入FstzsXm表
-			 */
-			FstzsXm xm = new FstzsXm();
-			xm.setXmxxb(xmxxbService.getById(paymentItemPending.getXmbzj()));
-			xm.setDelFlag(0);
-			xm.setStatus(0);
-
-			xm.setJsdwmc(paymentItemPending.getDwmc());
-			xm.setGcxmmc(paymentItemPending.getXmmc());
-			xm.setSlbh(paymentItemPending.getSlbh());
-			xm.setYjje(paymentItemPending.getZyjje());
-			fstzsXmService.save(xm);
 		}else{
 			paymentItemPendingService.update(paymentItemPending);
-			/**
-			 * 20221116
-			 * 更新paymentItemPending表同时，更新FstzsXm表
-			 */
-			FstzsXm xm = fstzsXmService.getBySlbh(paymentItemPending.getSlbh());
-			if(xm == null) {
-				xm = new FstzsXm();
-				xm.setXmxxb(xmxxbService.getById(paymentItemPending.getXmbzj()));
-				xm.setDelFlag(0);
-				xm.setStatus(0);
-				xm.setJsdwmc(paymentItemPending.getDwmc());
-				xm.setGcxmmc(paymentItemPending.getXmmc());
-				xm.setSlbh(paymentItemPending.getSlbh());
-				xm.setYjje(paymentItemPending.getZyjje());
-				fstzsXmService.save(xm);
-			} else {
-				xm.setJsdwmc(paymentItemPending.getDwmc());
-				xm.setGcxmmc(paymentItemPending.getXmmc());
-				xm.setSlbh(paymentItemPending.getSlbh());
-				xm.setYjje(paymentItemPending.getZyjje());
-				fstzsXmService.update(xm);
-			}
 		}
 		
 		return RELOAD;

src/com/jshx/pjjx/entity/Pjjx.java

@@ -93,16 +93,6 @@ public class Pjjx extends BaseModel
 	private String zsfw;
 	private String dwdm;
 	
-	/**
-	 * 使用线上缴款时的缴款人
-	 */
-	private String jkr;
-
-	/**
-	 * 使用线上缴款时的缴款金额
-	 */
-	private String jkje;
-	
 	public Pjjx(){
 	}
 	
@@ -289,19 +279,4 @@ this.state = state;
 		this.zsfw = zsfw;
 	}
 
-	public String getJkr() {
-		return jkr;
-	}
-
-	public void setJkr(String jkr) {
-		this.jkr = jkr;
-	}
-
-	public String getJkje() {
-		return jkje;
-	}
-
-	public void setJkje(String jkje) {
-		this.jkje = jkje;
-	}
 }

src/com/jshx/xmcxb/web/XmcxbAction.java

@@ -16,6 +16,7 @@ import java.util.UUID;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.jshx.fstzs.service.FstzsXmService;
 import org.activiti.engine.IdentityService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
@@ -111,6 +112,8 @@ public class XmcxbAction extends BaseAction
 		    @Autowired
 			private JktzsService jktzsService;
 			@Autowired
+			private FstzsXmService fstzsXmService;
+			@Autowired
 			private QtfymxService qtfymxService;
 			 @Autowired
 				private JkmxService jkmxService;
@@ -743,6 +746,7 @@ public class XmcxbAction extends BaseAction
 		         		if(null!=jktzs&&jktzs.size()>0){
 		         			for (Jktzs jktbean : jktzs) {
 		         				jktzsService.deleteWithFlag(jktbean.getId());
+								 fstzsXmService.deleteWithFlagBySlbh(jktbean.getSlbh());
 							}
 		         			
 		         		}