上报保密项目功能开发

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewService.java

@@ -3954,8 +3954,8 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                                             }
                                             reported.setSecrecyProjectName(String.valueOf(lastSecrecyProjectNameSort));
                                         }
-                                        //map = RuralProjectReportedInfoUtil.reportedDataSecretManage(reported,secrecyProjectName);
-                                        map = RuralProjectReportedInfoUtil.reportedDataManage(reported);
+                                        map = RuralProjectReportedInfoUtil.reportedDataSecretManage(reported,"BM" + secrecyProjectName);
+                                        //map = RuralProjectReportedInfoUtil.reportedDataManage(reported);
                                         break;
                                     default:
                                         map = RuralProjectReportedInfoUtil.reportedDataManage(reported);

src/main/java/com/jeeplus/modules/ruralprojectrecords/utils/RuralProjectReportedInfoUtil.java

@@ -203,7 +203,7 @@ public class RuralProjectReportedInfoUtil {
         //合同类型，必填（默认 其他）
         map.put("contractTypeCd","90");
         //项目类型，必填
-        map.put("projectTypeCd",reported.getProjectType());
+        map.put("projectTypeCd","90");
         //委托单位，必填
         map.put("entrustUnit","0");
         //委托单位联系电话，必填
@@ -244,23 +244,23 @@ public class RuralProjectReportedInfoUtil {
         //咨询项目负责人身份证号，必填
         map.put("leaderLetterNum",responsiblePerson.getIdCard());
         //咨询项目负责人完成营业收入比例（%），必填
-        map.put("leaderIncomePercent","0");
+        map.put("leaderIncomePercent",responsiblePerson.getWcyysrbl().toString());
         //咨询项目负责人完成营业收入
-        map.put("leaderIncomeMoney","0");
+        map.put("leaderIncomeMoney",responsiblePerson.getWcyysr().toString());
 
         //添加咨询员信息
-        //map.put("staffs","");
+        map.put("staffs",consultantManage(reportedConsultantList));
 
         //工程结构，必填（默认 其他）
         map.put("projectStructCd","099");
-        //地上层数
+        /*//地上层数
         map.put("floorUp","0");
 
         //地下层数
-        map.put("floorDown","0");
-        //建筑规模，必填（默认 其他）
-        map.put("projectAreaVal","0");
+        map.put("floorDown","0");*/
         //建筑规模单位，必填
+        map.put("projectAreaVal","0");
+        //建筑规模，必填（默认 其他）
         map.put("projectAreaUnit", "50");
         //工程用途，必填
         map.put("projectUseCd","09");
@@ -269,26 +269,26 @@ public class RuralProjectReportedInfoUtil {
 
 
         //如果项目类型是工程结算审核
-        if(StringUtils.isNotBlank(reported.getProjectType()) && "10".equals(reported.getProjectType())){
+        /*if(StringUtils.isNotBlank(reported.getProjectType()) && "10".equals(reported.getProjectType())){
 
             //合同价(万元)
             map.put("contractFee","0");
             //送审价(万元)
-            map.put("submitAuditFee",notRequiredManage(reported.getSongShenJia()));
+            map.put("submitAuditFee","0");
             //审定价(万元)
             map.put("fixedAuditFee","0");
             //审核增减额
             map.put("checkCutFee","0");
             //审核增减率
             map.put("checkCutLv","0");
-        }
+        }*/
         //咨询项目造价包含内容说明，必填
         map.put("projectContainContent","");
 
         //如果项目类型是全过程
-        if(StringUtils.isNotBlank(reported.getProjectType()) && "17".equals(reported.getProjectType())){
+        /*if(StringUtils.isNotBlank(reported.getProjectType()) && "17".equals(reported.getProjectType())){
             //工程项目总投资(万元)
-            map.put("totalInvestment",notRequiredManage(reported.getProjectTotalInvestment()));
+            map.put("totalInvestment","0");
             //总咨询师
             map.put("chiefConsultant","0");
             //咨询档案编号
@@ -312,7 +312,7 @@ public class RuralProjectReportedInfoUtil {
             map.put("designFee","0");
             //其他收入
             map.put("otherFee","0");
-        }
+        }*/
         //项目状态，必填(默认给0，即暂存；2：直接上报)
         map.put("delFlag","2");
 

src/main/java/com/jeeplus/modules/sys/service/WorkattachmentService.java

@@ -356,8 +356,69 @@ public class WorkattachmentService extends CrudService<WorkattachmentDao, Workat
 				.replace("&lt;", "<")
 				.replace("&gt;", ">")
 				.replace("&amp;", "&")
-				.replace("&quot;", "\"")
-				.replace("&apos;", "'");
+				.replace("&apos;", "'")
+				.replace("&cent;", "¢")
+				.replace("&pound;", "£")
+				.replace("&yen;", "¥")
+				.replace("&euro;", "€")
+				.replace("&copy;", "©")
+				.replace("&reg;", "®")
+				.replace("&sect;", "§")
+				.replace("&deg;", "°")
+				.replace("&plusmn;", "±")
+				.replace("&micro;", "µ")
+				.replace("&para;", "¶")
+				.replace("&middot;", "·")
+				.replace("&times;", "×")
+				.replace("&divide;", "÷")
+				.replace("&alpha;", "α")
+				.replace("&beta;", "β")
+				.replace("&gamma;", "γ")
+				.replace("&delta;", "δ")
+				.replace("&epsilon;", "ε")
+				.replace("&zeta;", "ζ")
+				.replace("&eta;", "η")
+				.replace("&theta;", "θ")
+				.replace("&iota;", "ι")
+				.replace("&kappa;", "κ")
+				.replace("&lambda;", "λ")
+				.replace("&mu;", "μ")
+				.replace("&nu;", "ν")
+				.replace("&xi;", "ξ")
+				.replace("&omicron;", "ο")
+				.replace("&pi;", "π")
+				.replace("&rho;", "ρ")
+				.replace("&sigma;", "σ")
+				.replace("&tau;", "τ")
+				.replace("&upsilon;", "υ")
+				.replace("&phi;", "φ")
+				.replace("&chi;", "χ")
+				.replace("&psi;", "ψ")
+				.replace("&omega;", "ω")
+				.replace("&Alpha;", "Α")
+				.replace("&Beta;", "Β")
+				.replace("&Gamma;", "Γ")
+				.replace("&Delta;", "Δ")
+				.replace("&Epsilon;", "Ε")
+				.replace("&Zeta;", "Ζ")
+				.replace("&Eta;", "Η")
+				.replace("&Theta;", "Θ")
+				.replace("&Iota;", "Ι")
+				.replace("&Kappa;", "Κ")
+				.replace("&Lambda;", "Λ")
+				.replace("&Mu;", "Μ")
+				.replace("&Nu;", "Ν")
+				.replace("&Xi;", "Ξ")
+				.replace("&Omicron;", "Ο")
+				.replace("&Pi;", "Π")
+				.replace("&Rho;", "Ρ")
+				.replace("&Sigma;", "Σ")
+				.replace("&Tau;", "Τ")
+				.replace("&Upsilon;", "Υ")
+				.replace("&Phi;", "Φ")
+				.replace("&Chi;", "Χ")
+				.replace("&Psi;", "Ψ")
+				.replace("&Omega;", "Ω");
 	}
 
 	/**

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/newReportedForm.jsp

@@ -1233,13 +1233,13 @@
                     </div>
                 </div>
 
-                <%--<div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>是否是保密项目</label>
                     <div class="layui-input-block">
                         <input type="radio" title="否" name="secrecy" checked id="secrecy" value="0">
                         <input type="radio" title="是" name="secrecy" id="secrecy1" value="1">
                     </div>
-                </div>--%>
+                </div>
             </div>
 
 

src/main/webapp/webpage/modules/ruralprojectrecords/cost/newReported/reportedAudit.jsp

@@ -1245,13 +1245,13 @@
                     </div>
                 </div>
 
-                <%--<div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>是否是保密项目</label>
                     <div class="layui-input-block">
                         <input type="radio" title="否" name="secrecy" checked id="secrecy" value="0">
                         <input type="radio" title="是" name="secrecy" id="secrecy1" value="1">
                     </div>
-                </div>--%>
+                </div>
             </div>
 
 

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/newReported/reportedForm.jsp

@@ -1205,13 +1205,13 @@
                     </div>
                 </div>
 
-                <%--<div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>是否是保密项目</label>
                     <div class="layui-input-block">
                         <input type="radio" title="否" name="secrecy" checked id="secrecy" value="0">
                         <input type="radio" title="是" name="secrecy" id="secrecy1" value="1">
                     </div>
-                </div>--%>
+                </div>
             </div>
 
 

src/main/webapp/webpage/modules/ruralprojectrecords/view/reportedView.jsp

@@ -290,13 +290,13 @@
                     </div>
                 </div>
 
-                <%--<div class="layui-item layui-col-sm6 lw6">
+                <div class="layui-item layui-col-sm6 lw6">
                     <label class="layui-form-label double-line"><span class="require-item">*</span>是否是保密项目</label>
                     <div class="layui-input-block">
                         <input type="radio" title="否" disabled name="secrecy" checked id="secrecy" value="0">
                         <input type="radio" title="是" disabled name="secrecy" id="secrecy1" value="1">
                     </div>
-                </div>--%>
+                </div>
             </div>