修改部分小问题

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

@@ -20,7 +20,7 @@
 		function search_fstzsXm(){
 			var queryParams = {
 				"fstzsXm.slbh": $("#slbh").val(),
-				"fstzsXm.jsdwmc": $("#dwmc").val(),
+				"fstzsXm.jsdwmc": $("#jsdwmc").val(),
 				"fstzsXm.gcxmmc": $("#gcxmmc").val(),
 				"fstzsXm.yjje": $("#yjje").val()
 			};
@@ -35,7 +35,7 @@
 				url:'${ctx}/jsp/fstzs/fstzsXmList.action?status=0',
 				queryParams:{
 					"fstzsXm.slbh": $("#slbh").val(),
-					"fstzsXm.dwmc": $("#dwmc").val(),
+					"fstzsXm.jsdwmc": $("#jsdwmc").val(),
 					"fstzsXm.gcxmmc": $("#gcxmmc").val(),
 					"fstzsXm.yjje": $("#yjje").val(),
 				},
@@ -57,6 +57,9 @@
 						}},
 					{field:'jzmj',title:'总建筑面积',width:150,formatter: function (value, row, index){
 							return row.xmxxb.csmj;
+						}},
+					{field:'jzmj',title:'应缴面积',width:150,formatter: function (value, row, index){
+							return row.xmxxb.yjmj;
 						}}
 				]]
 			}));

WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp

@@ -388,7 +388,7 @@
     </div>
 </form>
 横联
-<c:if test="${rfxm.mjyj != '004'}">
+<c:if test="${rfxm.mjyj != '004'}"  >
     <div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'>
         <img class='screen-only' src="${ctx}/images/img/gz.jpg" style="position:absolute;width:100%;height:100%"/>
 
@@ -475,7 +475,7 @@
             </c:when>
             <c:otherwise>
                 <c:choose>
-                    <c:when test="${mjyj != '004' && mjyj != '003'}"> <!--如果 -->
+                    <c:when test="${mjyj != '004' && mjyj != '002'}"> <!--如果 -->
                         <c:choose>
                             <c:when test="${rfxm.isRfyz=='1'}"> <!--如果 -->
                                 <c:choose>

conf/system.properties

@@ -137,18 +137,16 @@ publicKey=30819F300D06092A864886F70D010101050003818D0030818902818100C3CF2F786A2D
 privateKey=30820275020100300D06092A864886F70D01010105000482025F3082025B02010002818100C3CF2F786A2D19146F4B1CBAA812271254994AEA5AA1D707B6FBA5C284C6679D6BE432E861478EE933A17C957574EC07574FC33DE245685C15A0EF706FB68D628CD0F7DE99C602A02ED3B477440BA89D039005CDCA7BB8D3F93209CACA680DF1D485C983E6F5B30D713AF131D37502497DE1DEFE533E1D93D880D716DE89D9F902030100010281800E42B79D5876425E57A0ABCDF851A220D6A2776F4BFC7F71A364FE74854101E8D823BD85691852132FDC71FB5C9B90591485CD9D632E54E467FAD99561BD74DC78DE13E86A9017E89CAD1758DD44AE596B0C59E01B68AB187EF2CF8C88C21224DE563475277AD9FB4816B6DD8B9FAD54C4A045F1FFC9090F00EB5D0E4EAADF81024100F0062C05CAA10926CBC31633A87364AFC77239921700D377CFF004D7E36E52699332E562C81DBD1491CD9241A7C7AF0F00BD8F03E4FE16AC2A1E4696ACF3C5C9024100D0D7A089752BD0834730CC490BA9A9E1AE95FF7BD555F7CD38B0366F7ADE548E65BCF049073E6EC048B6880FF32FFB82E5FF016368AB92D63285A4A1AD424AB102404FE72E168B7B0A69E0E143EDD480FD9ECABD8ACEC85B9D0A40ADBD5F05363FB727AA84D45A9C13CADA32DE227F312964CC314E7FD46685B3B09DBD9001697189024068F3A3FAD046879021ABB54E142D5C714D129684FDEE290D1A2AFC0044280D284E9A87CABB7835A22E2884F2370D6B011A626FA92C85E4D1FE2BC95372C5B8D1024059F575C1DC549538A1E9FB853C53074E05CBE6A220409056D2815B594DD76D139A0A95A5AEE539CB11532A6254315E123C0B97BDE35E2DD2D4D40B0E46391463
 
 #非税系统
-fs-url:http://172.16.250.6:18001/agency-web/agency3/rest.do
-fs-appid:NJSCSJSFYZSFWZX3908073
-fs-appkey:f756761c49d19870cb444582312d
+fs-url:http://172.16.250.115:18001/agency-web/agency3/rest.do
+fs-appid:NJSCSJSFYZSFWZX7070194
+fs-appkey:d85e08e7cb8e6b8ad45032198aa9
 fs-kpdbm:001
 fs-dwbm:708002
 fs-qhbm:320100
-fs-pjdm:32010122
+fs-pjdm:32990120
 fs-version:1.0.1
-fs-billcode:00010302
-#收费项目编号，上线需要切为线上编码，10304240101为测试编码
-fs-sfxmbh:10304240101
-#fs-sfxmbh:103015601
+fs-billcode:9901
+fs-sfxmbh:103015601
 
 #非税开票
-EInvoiceContent:<EInvoice><Header><EInvoiceTag>CZ-EI-32</EInvoiceTag><EInvoiceID>{{EInvoiceID}}</EInvoiceID><Version>1.1.0</Version></Header><EInvoiceData><Main><EInvoiceName>\u6c5f\u82cf\u7701\u975e\u7a0e\u6536\u5165\u7edf\u4e00\u7968\u636e\uff08\u7535\u5b50\uff09</EInvoiceName><EInvoiceCode>{{EInvoiceCode}}</EInvoiceCode><EInvoiceNumber>{{EInvoiceNumber}}</EInvoiceNumber><RandomNumber>{{random}}</RandomNumber><EInvoiceSpecimenCode>3201012010</EInvoiceSpecimenCode><SupervisorAreaCode>320100</SupervisorAreaCode><TotalAmount>{{yjje}}</TotalAmount><IssueDate>{{kprq}}</IssueDate><IssueTime>{{kpsj}}</IssueTime><InvoicingParty><InvoicingPartyCode>708002</InvoicingPartyCode><InvoicingPartyName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</InvoicingPartyName><RecName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</RecName><RecAcct>10105901040000062</RecAcct><RecOpBk>\u5357\u4eac\u519c\u884c\u9f13\u697c\u652f\u884c</RecOpBk></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyCode/><PayerPartyName>{{jkr}}</PayerPartyName><PayerAcct/><PayerOpBk/></PayerParty><PayMode/><BizCode>{{lsh}}</BizCode><CurrencyType/><ExchangeRate/><Remark>{{beizhu}}</Remark><HandlingPerson>{{jbr}}</HandlingPerson><Checker/><SupervisorRemark/><InvoicingPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></InvoicingPartySeal><SupervisorPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></SupervisorPartySeal><MainExt><RelatedInvoiceCode/><RelatedInvoiceNumber/><PayCode>{{jkm}}</PayCode><BusinessNumber/><BusinessDate/><Gender/><Age/><Address/><School/><Faculty/><Major/><Classes/><StudentID/><MedicalType/><MedicalDate/><CaseNumber/><PatientNumber/><HospitalizationNumber/><DepartmentName/><InHospitalDate/><OutHospitalDate/><PrepayAmount/><RechargeAmount/><RefundAmount/><OrgType/><MedicalInsuranceType/><MedicalInsuranceID/><FundPayAmount/><OtherPayAmount/><AccountPayAmount/><OwnPayAmount/><SelfpaymentAmount/><SelfpaymentCost/><Custom1/><Custom2/><Custom3/><Custom4/><Custom5/><Custom6/><Custom7/><Custom8/><Custom9/><Custom10/><Custom11/><Custom12/></MainExt></Main><Details><Item><ItemCode>{{itemCode}}</ItemCode><ItemName>\u57ce\u5e02\u57fa\u7840\u8bbe\u65bd\u914d\u5957\u8d39-\u57ce\u533a</ItemName><ItemQuantity>{{yjmj}}</ItemQuantity><ItemUnit>\u5143</ItemUnit><ItemStd>150.00</ItemStd><ItemAmount>{{yjje}}</ItemAmount><ItemRemark/><ItemExt><ItemDetailName/></ItemExt></Item></Details></EInvoiceData></EInvoice>
\ No newline at end of file
+EInvoiceContent:<EInvoice><Header><EInvoiceTag>CZ-EI-32</EInvoiceTag><EInvoiceID>{{EInvoiceID}}</EInvoiceID><Version>1.1.0</Version></Header><EInvoiceData><Main><EInvoiceName>\u6c5f\u82cf\u7701\u975e\u7a0e\u6536\u5165\u7edf\u4e00\u7968\u636e\uff08\u7535\u5b50\uff09</EInvoiceName><EInvoiceCode>{{EInvoiceCode}}</EInvoiceCode><EInvoiceNumber>{{EInvoiceNumber}}</EInvoiceNumber><RandomNumber>{{random}}</RandomNumber><EInvoiceSpecimenCode>3201012301</EInvoiceSpecimenCode><SupervisorAreaCode>320101</SupervisorAreaCode><TotalAmount>{{yjje}}</TotalAmount><IssueDate>{{kprq}}</IssueDate><IssueTime>{{kpsj}}</IssueTime><InvoicingParty><InvoicingPartyCode>708002</InvoicingPartyCode><InvoicingPartyName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</InvoicingPartyName><RecName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</RecName><RecAcct>10105901040000062</RecAcct><RecOpBk>\u5357\u4eac\u519c\u884c\u9f13\u697c\u652f\u884c</RecOpBk></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyCode/><PayerPartyName>{{jkr}}</PayerPartyName><PayerAcct/><PayerOpBk/></PayerParty><PayMode/><BizCode>{{lsh}}</BizCode><CurrencyType/><ExchangeRate/><Remark>{{beizhu}}</Remark><HandlingPerson>{{jbr}}</HandlingPerson><Checker/><SupervisorRemark/><InvoicingPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></InvoicingPartySeal><SupervisorPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></SupervisorPartySeal><MainExt><RelatedInvoiceCode/><RelatedInvoiceNumber/><PayCode>{{jkm}}</PayCode><BusinessNumber/><BusinessDate/><Gender/><Age/><Address/><School/><Faculty/><Major/><Classes/><StudentID/><MedicalType/><MedicalDate/><CaseNumber/><PatientNumber/><HospitalizationNumber/><DepartmentName/><InHospitalDate/><OutHospitalDate/><PrepayAmount/><RechargeAmount/><RefundAmount/><OrgType/><MedicalInsuranceType/><MedicalInsuranceID/><FundPayAmount/><OtherPayAmount/><AccountPayAmount/><OwnPayAmount/><SelfpaymentAmount/><SelfpaymentCost/><Custom1/><Custom2/><Custom3/><Custom4/><Custom5/><Custom6/><Custom7/><Custom8/><Custom9/><Custom10/><Custom11/><Custom12/></MainExt></Main><Details><Item><ItemCode>{{itemCode}}</ItemCode><ItemName>\u57ce\u5e02\u57fa\u7840\u8bbe\u65bd\u914d\u5957\u8d39-\u57ce\u533a</ItemName><ItemQuantity>{{yjmj}}</ItemQuantity><ItemUnit>\u5143</ItemUnit><ItemStd>150.00</ItemStd><ItemAmount>{{yjje}}</ItemAmount><ItemRemark/><ItemExt><ItemDetailName/></ItemExt></Item></Details></EInvoiceData></EInvoice>
\ No newline at end of file

src/com/jshx/fstzs/fsutil/FsRequest.java

@@ -77,8 +77,8 @@ public class FsRequest {
 
         Map<String,String> mapDatail = new HashMap<>();
         mapDatail.put("item_code",getProp("fs-sfxmbh"));
-        mapDatail.put("std",fstzs.getYjje());//收费标准
-        mapDatail.put("number","1");//数量
+        mapDatail.put("std","150");//收费标准
+        mapDatail.put("number",fstzs.getYjmj());//数量
         mapDatail.put("amt",fstzs.getYjje());//金额
         List<Map<String,String>> list = new ArrayList<>();
         list.add(mapDatail);

src/com/jshx/fstzs/fsutil/SecurityUtils.java

@@ -9,7 +9,7 @@ import java.util.TreeMap;
  *  财政局
  */
 public class SecurityUtils {
-    public static final String APPKEY = "f756761c49d19870cb444582312d";
+    public static final String APPKEY = "d85e08e7cb8e6b8ad45032198aa9";
     public static final String KEY = "security";
 
     /**

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

@@ -331,10 +331,7 @@ public class FstzsAction extends BaseAction {
         dbXm.setJkrlx(fstzsXm.getJkrlx());
 
         HashMap<String, Object> params = new HashMap<>();
-        params.put("fsxmId",dbXm.getSlbh());
-        params.put("status",new ArrayList<Integer>(){{
-            add(1);
-        }});
+        params.put("fsxmId",dbXm.getId());
         fstzsList = fstzsService.findList(params);
         String beizhuAppend = dbXm.getSlbh() + "，共" + fstzsList.size() + "张电子发票";
         if(TextUtils.isEmpty(dbXm.getBeizhu())) {

src/com/jshx/jfzm/web/JfzmAction.java

@@ -154,7 +154,7 @@ public class JfzmAction extends BaseAction {
                 RfxmSfxx sfxx = rfxmSfxxList == null || rfxmSfxxList.size() == 0 ? null : rfxmSfxxList.get(0);
 
                 // 1,判断是否显示同步按钮  2，判断是否置灰
-                r.setShowTb((!"003".equals(r.getMjyj()) && r.getIsSl() != 1) ? 1 : 0);//房改办,竖联,不显示施工许可
+                r.setShowTb((!"002".equals(r.getMjyj()) && r.getIsSl() != 1) ? 1 : 0);//房改办,竖联,不显示施工许可
 
                 try {
                     r.setShowYb(Double.parseDouble(pih.getPtyjje()) != 0 ? 1 : 0);//配套费=0,不显示一般缴费证明

src/com/jshx/rfxm/web/RfxmAction.java

@@ -504,7 +504,7 @@ public class RfxmAction extends BaseAction
 			rfxmSfxx =  rfxmSfxxService.findRfxmSfxx(paraMap2);
 			if(rfxm.getIsRfyz() == 1) {
 				rfxm.setEnableRfyz(0);
-			} else if("004".equals(rfxm.getMjyj()) || "003".equals(rfxm.getMjyj())) {//非市本级的房改办项目
+			} else if("004".equals(rfxm.getMjyj()) || "002".equals(rfxm.getMjyj())) {//非市本级的房改办项目
 				rfxm.setEnableRfyz(0);
 			} else if(rfxm.getIsSbj() == 0) {
 				rfxm.setEnableRfyz(1);