Merge remote-tracking branch 'origin/master'

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

@@ -3631,24 +3631,6 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
         String titleStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】上报待审批";
         String contentStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】上报待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
 
-        String businessKey = reported.getId();
-        Office office = UserUtils.getSelectOffice();
-        WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("gg3125f1f194582bdda9abcew750904", office);
-        // 启动流程
-        String processType = workActivityMenu.getProcessType();
-        StringBuffer buffer = new StringBuffer();
-        Activity activity = new Activity();
-        WorkProjectNotify workProjectNotify = UtilNotify
-                .saveNotify(reported.getId(),
-                        null,
-                        reported.getCompany().getId(),
-                        titleStr,
-                        contentStr,
-                        "98",
-                        "0",
-                        "待审批",
-                        ""
-                );
 
         List<User> users = new ArrayList<>();
         List<User> bmzrList = UserUtils.getByRoleActivityEnname("sbglyyjla",3,reported.getOffice().getId(),"4",reported.getCreateBy());
@@ -3667,6 +3649,9 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                 variables.put("bmzrCount",bmzrList.size());
                 variables.put("bmzrList", bmzrList);
                 variables.put("passLv",false);
+
+                titleStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】 审核增减率大于30%，上报待审批";
+                contentStr = "报告号："+projectReportData.getNumber()+"。项目【"+projectRecords.getProjectName()+"】 审核增减率大于30%，上报待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
             }else{
                 variables.put("bmzrCount",bmzrList.size());
                 variables.put("bmzrList", bmzrList);
@@ -3678,6 +3663,25 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             variables.put("passLv",true);
         }
 
+        String businessKey = reported.getId();
+        Office office = UserUtils.getSelectOffice();
+        WorkActivityMenu workActivityMenu = workActivityMenuService.findByParentAndOffice("gg3125f1f194582bdda9abcew750904", office);
+        // 启动流程
+        String processType = workActivityMenu.getProcessType();
+        StringBuffer buffer = new StringBuffer();
+        Activity activity = new Activity();
+        WorkProjectNotify workProjectNotify = UtilNotify
+                .saveNotify(reported.getId(),
+                        null,
+                        reported.getCompany().getId(),
+                        titleStr,
+                        contentStr,
+                        "98",
+                        "0",
+                        "待审批",
+                        ""
+                );
+
 
         if (com.jeeplus.common.utils.StringUtils.isNotBlank(workActivityMenu.getId())) {
             workProjectNotify.setNotifyRole("");
@@ -3728,7 +3732,17 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
             userIds.add(u.getId());
             workProjectNotify.setUser(u);
             workProjectNotify.setId("");
-            workProjectNotify.setNotifyRole("报告管理员审批");
+
+            if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
+                if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ){
+                    workProjectNotify.setNotifyRole("总审审批");
+                }else{
+                    workProjectNotify.setNotifyRole("上报管理员审批");
+                }
+            }else{
+                workProjectNotify.setNotifyRole("上报管理员审批");
+            }
+
             workProjectNotifyService.save(workProjectNotify);
             Map<String,Object> extras = new HashMap<>();
             extras.put("type","7002");
@@ -4038,7 +4052,18 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         }
                         break;
                     } else if ("modifyApply".equals(taskDefKey)&& count.contains("0")) {
-                        notifyRole = "上报管理员审批";
+
+                        if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
+                            if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ){
+                                notifyRole = "总审审批";
+                            }else{
+                                notifyRole = "上报管理员审批";
+                            }
+                        }else{
+                            notifyRole = "上报管理员审批";
+                        }
+
+
                         taskCount = "0";
                         exp = "pass";
                         vars.put("bmzrList", auditUsers);
@@ -4173,8 +4198,29 @@ public class RuralProjectMessageNewService extends CrudService<RuralProjectMessa
                         users.add( reported.getCreateBy());
                     } else {
                         if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办
-                            title = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批";
-                            str = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
+                            if(StringUtils.isNotBlank(reported.getJingHeJianLv())){
+                                if(Double.valueOf(reported.getJingHeJianLv())>30 || Double.valueOf(reported.getJingHeJianLv())< -30 ){
+                                    if(null != projectRecords.getReportData() && StringUtils.isNotBlank(projectRecords.getReportData().getNumber())){
+                                        title = "报告号："+projectRecords.getReportData().getNumber()+"。项目【"+projectRecords.getProjectName()+"】 审核增减率大于30%，上报待审批";
+                                        str = "报告号："+projectRecords.getReportData().getNumber()+"。项目【"+projectRecords.getProjectName()+"】 审核增减率大于30%，上报待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
+                                    }else{
+                                        title = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批";
+                                        str = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
+                                    }
+                                     }else{
+                                    title = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批";
+                                    str = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
+                                }
+                            }else{
+                                title = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批";
+                                str = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
+                            }
+
+                            if(null != projectRecords.getReportData() && StringUtils.isNotBlank(projectRecords.getReportData().getNumber())){
+                                }else{
+                                title = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批";
+                                str = "项目【"+projectRecords.getProjectName()+"】上报重新申请，待审批，项目" + (0 == projectRecords.getOverDueStatus()?"未超期":"超期");
+                            }
                             WorkProjectNotify notify = new WorkProjectNotify();
                             notify.setNotifyId(reported.getId());
                             userList = workProjectNotifyService.readByNotifyId(notify);

src/main/java/com/jeeplus/modules/tools/utils/HttpPostTool.java

@@ -7,8 +7,10 @@ import java.net.URL;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
+import java.security.SecureRandom;
 
 import com.jeeplus.common.utils.MyX509TrustManager;
+import com.jeeplus.common.utils.StringUtils;
 import com.jeeplus.modules.utils.Aestool;
 import com.jeeplus.modules.utils.Rsatool;
 import net.sf.json.JSONObject;
@@ -27,10 +29,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.TrustManager;
+import javax.net.ssl.*;
 
 /**
  * @author: 大猫
@@ -159,57 +158,92 @@ public class HttpPostTool {
      * @return JSONObject(通过JSONObject.get(key)的方式获取json对象的属性值)
      */
     public static String doPost(String requestUrl, String outputStr) {
+        // 空值防护
+        if (StringUtils.isBlank(requestUrl)) {
+            System.err.println("请求URL不能为空");
+            return "{}";
+        }
+
         JSONObject jsonObject = null;
-        StringBuffer buffer = new StringBuffer();
+        HttpURLConnection httpUrlConn = null;
+
         try {
-            // 创建SSLContext对象，并使用我们指定的信任管理器初始化
-            TrustManager[] tm = { new MyX509TrustManager() };
-            SSLContext sslContext = SSLContext.getInstance("SSL", "SunJSSE");
-            sslContext.init(null, tm, new java.security.SecureRandom());
-            // 从上述SSLContext对象中得到SSLSocketFactory对象
-            SSLSocketFactory ssf = sslContext.getSocketFactory();
+            URL url = new URL(requestUrl); // 移除sun内部类，自动适配HTTP/HTTPS
+            httpUrlConn = (HttpURLConnection) url.openConnection();
 
-            //URL url = new URL(requestUrl);
-            URL url= new URL(null, requestUrl, new sun.net.www.protocol.https.Handler());
-            HttpsURLConnection httpUrlConn = (HttpsURLConnection) url.openConnection();
-            httpUrlConn.setSSLSocketFactory(ssf);
+            // 若为HTTPS连接，配置SSL
+            if (httpUrlConn instanceof HttpsURLConnection) {
+                HttpsURLConnection httpsConn = (HttpsURLConnection) httpUrlConn;
+                // 初始化SSL上下文
+                SSLContext sslContext = SSLContext.getInstance("TLS"); // 替换SSL为TLS，更安全
+                sslContext.init(null, new TrustManager[]{new MyX509TrustManager()}, new SecureRandom());
+                httpsConn.setSSLSocketFactory(sslContext.getSocketFactory());
+                // 忽略主机名验证（可选，生产需关闭）
+                httpsConn.setHostnameVerifier((hostname, session) -> true);
+            }
 
+            // 通用连接配置
             httpUrlConn.setDoOutput(true);
             httpUrlConn.setDoInput(true);
             httpUrlConn.setUseCaches(false);
             httpUrlConn.setRequestMethod("POST");
+            httpUrlConn.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
 
-            // 当有数据需要提交时
-            if (null != outputStr) {
-                OutputStream outputStream = httpUrlConn.getOutputStream();
-                // 注意编码格式，防止中文乱码
-                outputStream.write(outputStr.getBytes("UTF-8"));
-                outputStream.close();
+            // 提交请求参数
+            if (StringUtils.isNotBlank(outputStr)) {
+                try (OutputStream outputStream = httpUrlConn.getOutputStream()) {
+                    outputStream.write(outputStr.getBytes("UTF-8"));
+                    outputStream.flush();
+                }
             }
 
-            // 将返回的输入流转换成字符串
-            InputStream inputStream = httpUrlConn.getInputStream();
-            InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "utf-8");
-            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+            // 读取响应（try-with-resources自动关闭资源）
+            int responseCode = httpUrlConn.getResponseCode();
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                try (InputStream inputStream = httpUrlConn.getInputStream();
+                     InputStreamReader isr = new InputStreamReader(inputStream, "UTF-8");
+                     BufferedReader br = new BufferedReader(isr)) {
 
-            String str = null;
-            while ((str = bufferedReader.readLine()) != null) {
-                buffer.append(str);
+                    StringBuffer buffer = new StringBuffer();
+                    String str;
+                    while ((str = br.readLine()) != null) {
+                        buffer.append(str);
+                    }
+                    // 容错：仅当返回非空时解析JSON
+                    if (StringUtils.isNotBlank(buffer.toString())) {
+                        jsonObject = JSONObject.fromObject(buffer.toString());
+                    } else {
+                        jsonObject = new JSONObject(); // 空JSON
+                    }
+                }
+            } else {
+                System.err.println("接口返回错误码：" + responseCode);
+                jsonObject = new JSONObject();
+                jsonObject.put("errorCode", responseCode);
             }
-            bufferedReader.close();
-            inputStreamReader.close();
-            // 释放资源
-            inputStream.close();
-            inputStream = null;
-            httpUrlConn.disconnect();
-            jsonObject = JSONObject.fromObject(buffer.toString());
+
+        } catch (SSLException e) {
+            System.err.println("HTTPS SSL认证失败：" + e.getMessage());
+            jsonObject = new JSONObject();
+            jsonObject.put("error", "SSL认证失败");
+        } catch (IOException e) {
+            System.err.println("IO异常（连接/读写失败）：" + e.getMessage());
+            jsonObject = new JSONObject();
+            jsonObject.put("error", "连接失败");
         } catch (Exception e) {
-            e.printStackTrace();
-            System.out.println("上报接口错误：" + e);
+            System.err.println("未知异常：" + e.getMessage());
+            jsonObject = new JSONObject();
+            jsonObject.put("error", "解析失败");
         } finally {
-            System.out.println(jsonObject.toString());
+            // 关闭连接
+            if (httpUrlConn != null) {
+                httpUrlConn.disconnect();
+            }
+            // 空值防护：避免NPE
+            System.out.println(jsonObject == null ? "{}" : jsonObject.toString());
         }
-        return jsonObject.toString();
+
+        return jsonObject == null ? "{}" : jsonObject.toString();
     }
 
 

src/main/resources/jeeplus.properties

@@ -297,8 +297,9 @@ remoteServer.uploadMode =2
 #\u6587\u4EF6\u670D\u52A1\u5668IP\u5730\u5740
 remoteServer.visit =
 
-#�ϱ��ӿ�
-reportedUrl = https://comp.jszj.com.cn:8031/api/addProject
+#上报省站接口
+#reportedUrl = https://comp.jszj.com.cn:8031/api/addProject
+reportedUrl = http://49.77.204.6:10081/JszjQY/rest/addProject
 
 
 #apptoken = Mt4een4BN8

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

@@ -158,30 +158,33 @@
                     //审定价
                     var ShenDingJia = parseFloat($("#ShenDingJia").val());
 
-                    //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
-                    if (projectReportDataReviewFee.toFixed(4) !== SongShenJia.toFixed(4)) {
-                        parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
-                        return false;
-                    }
+                    var projectType ='${ruralProjectRecordsReported.projectType}'
+                    if(projectType == '10'){
 
-                    //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
-                    if(projectReportDataApprovalFee.toFixed(4) !== ShenDingJia.toFixed(4)){
-                        parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
-                        return false;
+                        //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                        if (projectReportDataReviewFee.toFixed(4) !== SongShenJia.toFixed(4)) {
+                            parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
+                            return false;
+                        }
+
+                        //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                        if(projectReportDataApprovalFee.toFixed(4) !== ShenDingJia.toFixed(4)){
+                            parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
+                            return false;
+                        }
                     }
 
 
                     var ziXunBDE = parseFloat($("#ZiXunBDE").val());
                     var ShenDingJia = parseFloat($("#ShenDingJia").val());
                     var identification = '${identification}'
-                    console.log(identification)
-                    if(identification && "projectReported" === identification){
+                    var projectType = $("#ProjectType").val();
+                    if(projectType === '10'){
                         if(ziXunBDE.toFixed(4) !== ShenDingJia.toFixed(4)){
-                            parent.layer.msg("咨询标的额和审定价不同，请调整!", {icon: 5});
+                            parent.layer.msg("工程结算审核下，咨询标的额和审定价不同，请调整!", {icon: 5});
                             return ;
                         }
                     }
-                    var projectType = $("#ProjectType").val();
                     if(projectType == 19){
                         var advisoryIncome = $("#advisoryIncome").val();
                         var projectSupervisionIncome = $("#projectSupervisionIncome").val();
@@ -310,29 +313,36 @@
             return false;
         }
         $(document).ready(function() {
+            var projectType ='${ruralProjectRecordsReported.projectType}'
+            console.log(projectType)
+            if(projectType == '10'){
+
+                //质量复核中的送审价
+                var projectReportDataReviewFee = `${projectReportDataReviewFee}`
+                //质量复核中的审定价
+                var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
+                //送审价
+                var SongShenJia = $("#SongShenJia").val();
+                //审定价
+                var ShenDingJia = $("#ShenDingJia").val();
+                JingHeJianValue()
+
+                //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                if(projectReportDataReviewFee == SongShenJia){
+                    $('.songShenJiaSpanDiv').hide();
+                }else{
+                    $('.songShenJiaSpanDiv').show();
+                }
 
-            //质量复核中的送审价
-            var projectReportDataReviewFee = `${projectReportDataReviewFee}`
-            //质量复核中的审定价
-            var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
-            //送审价
-            var SongShenJia = $("#SongShenJia").val();
-            //审定价
-            var ShenDingJia = $("#ShenDingJia").val();
-            JingHeJianValue()
-
-            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
-            if(projectReportDataReviewFee == SongShenJia){
-                $('.songShenJiaSpanDiv').hide();
+                //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                if(projectReportDataApprovalFee == ShenDingJia){
+                    $('.shenDingJiaSpanDiv').hide();
+                }else{
+                    $('.shenDingJiaSpanDiv').show();
+                }
             }else{
-                $('.songShenJiaSpanDiv').show();
-            }
-
-            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
-            if(projectReportDataApprovalFee == ShenDingJia){
+                $('.songShenJiaSpanDiv').hide();
                 $('.shenDingJiaSpanDiv').hide();
-            }else{
-                $('.shenDingJiaSpanDiv').show();
             }
 
             var radioVal ;

src/main/webapp/webpage/modules/ruralprojectrecords/ruralporjectmessage/reportedModify.jsp

@@ -160,26 +160,34 @@
                 //审定价
                 var ShenDingJia = parseFloat($("#ShenDingJia").val());
 
-                //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
-                if (projectReportDataReviewFee.toFixed(4) !== SongShenJia.toFixed(4)) {
-                    parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
-                    return false;
-                }
+                var projectType ='${ruralProjectRecordsReported.projectType}'
+                if(projectType == '10'){
 
-                //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
-                if(projectReportDataApprovalFee.toFixed(4) !== ShenDingJia.toFixed(4)){
-                    parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
-                    return false;
+                    //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                    if (projectReportDataReviewFee.toFixed(4) !== SongShenJia.toFixed(4)) {
+                        parent.layer.msg("当前送审价和质量复核中的送审价不同,请先进行同步!", {icon: 5});
+                        return false;
+                    }
+
+                    //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                    if(projectReportDataApprovalFee.toFixed(4) !== ShenDingJia.toFixed(4)){
+                        parent.layer.msg("当前审定价和质量复核中的审定价不同,请先进行同步!", {icon: 5});
+                        return false;
+                    }
                 }
 
+
                 var ziXunBDE = parseFloat($("#ZiXunBDE").val());
                 var ShenDingJia = parseFloat($("#ShenDingJia").val());
-                if(ziXunBDE.toFixed(4) !== ShenDingJia.toFixed(4)){
-                    parent.layer.msg("咨询标的额和审定价不同，请调整!", {icon: 5});
-                    return ;
+                var identification = '${identification}'
+                var projectType = $("#ProjectType").val();
+                if(projectType === '10'){
+                    if(ziXunBDE.toFixed(4) !== ShenDingJia.toFixed(4)){
+                        parent.layer.msg("工程结算审核下，咨询标的额和审定价不同，请调整!", {icon: 5});
+                        return ;
+                    }
                 }
 
-                var projectType = $("#ProjectType").val();
                 if(projectType == 19){
                     var advisoryIncome = $("#advisoryIncome").val();
                     var projectSupervisionIncome = $("#projectSupervisionIncome").val();
@@ -331,31 +339,38 @@
             return false;
         }
         $(document).ready(function() {
-            //质量复核中的送审价
-            var projectReportDataReviewFee = `${projectReportDataReviewFee}`
-            //质量复核中的审定价
-            var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
-            //送审价
-            var SongShenJia = $("#SongShenJia").val();
-            //审定价
-            var ShenDingJia = $("#ShenDingJia").val();
+            var projectType ='${ruralProjectRecordsReported.projectType}'
+            console.log(projectType)
+            if(projectType == '10'){
 
-            //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
-            if(projectReportDataReviewFee == SongShenJia){
-                $('.songShenJiaSpanDiv').hide();
-            }else{
-                $('.songShenJiaSpanDiv').show();
-            }
+                //质量复核中的送审价
+                var projectReportDataReviewFee = `${projectReportDataReviewFee}`
+                //质量复核中的审定价
+                var projectReportDataApprovalFee = `${projectReportDataApprovalFee}`
+                //送审价
+                var SongShenJia = $("#SongShenJia").val();
+                //审定价
+                var ShenDingJia = $("#ShenDingJia").val();
+                JingHeJianValue()
 
-            //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
-            if(projectReportDataApprovalFee == ShenDingJia){
-                $('.shenDingJiaSpanDiv').hide();
+                //如果质量复核中的送审价和目前上报中的送审价不同，则需要将送审价对应的同步按钮展示出来
+                if(projectReportDataReviewFee == SongShenJia){
+                    $('.songShenJiaSpanDiv').hide();
+                }else{
+                    $('.songShenJiaSpanDiv').show();
+                }
+
+                //如果质量复核中的审定价和目前上报中的审定价不同，则需要将审定价对应的同步按钮展示出来
+                if(projectReportDataApprovalFee == ShenDingJia){
+                    $('.shenDingJiaSpanDiv').hide();
+                }else{
+                    $('.shenDingJiaSpanDiv').show();
+                }
             }else{
-                $('.shenDingJiaSpanDiv').show();
+                $('.songShenJiaSpanDiv').hide();
+                $('.shenDingJiaSpanDiv').hide();
             }
 
-            JingHeJianValue()
-
             var radioVal ;
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){

src/main/webapp/webpage/modules/workreimbursement/treeForm/all/workReimbursementAllFormAdd.jsp

@@ -646,6 +646,15 @@
                 tableMap["travelDays"] = $("#workAccountList tr").eq(i).find("td").eq(9).text();
                 trArr.push(tableMap);
             }
+            var uploadFlag = $("#uploadFlag").val() === "true";
+            console.log(uploadFlag)
+
+            console.log(typeof uploadFlag)
+            if(!uploadFlag){
+                parent.layer.msg("附件未上传完成，请稍后!", {icon: 5});
+                return ;
+            }
+
             if(obj == 2){
                 $("#inputForm").attr("action","${ctx}/workreimbursement/workReimbursementAll/store");
             }else{
@@ -1209,7 +1218,6 @@
 
 
         async function newInsertTitleInvoiceReimbursement(idValue,fileValue) {
-            console.log(8888888888)
             // 将原生DOM元素转换为jQuery对象（关键修复）
             var $idElement = $(idValue);
             // 再调用attr()方法获取name属性
@@ -1228,6 +1236,8 @@
             var size = (list.split('url')).length - 1;
             var files = $("#"+ fileValue.id)[0].files;
 
+            $("#uploadFlag").val(false)
+
             // 判断报销类型是否为电子报销
             for (var i = 0; i < files.length; i++) {
                 var file = files[i];
@@ -1296,6 +1306,8 @@
                 }
             }
             files.value=""
+
+            $("#uploadFlag").val(true)
         }
 
         // 处理文件上传
@@ -2350,6 +2362,7 @@
             <form:hidden path="id"/>
             <form:hidden path="achivesId"/>
             <form:hidden path="submitterId"/>
+            <input type="hidden" id="uploadFlag" value="true" />
             <input type="hidden" id="numberFlag" value="${workReimbursement.number}" />
             <input id="wId" type="hidden" value="${workReimbursement.id}">
             <input id="reimbursementType" name="reimbursementType" type="hidden" value="${workReimbursement.reimbursementType}">

src/main/webapp/webpage/modules/workreimbursement/treeForm/all/workReimbursementAllModifyApply.jsp

@@ -658,12 +658,23 @@
 
 
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+
+            var uploadFlag = $("#uploadFlag").val() === "true";
+            console.log(uploadFlag)
+
+            console.log(typeof uploadFlag)
+            if(!uploadFlag){
+                parent.layer.msg("附件未上传完成，请稍后!", {icon: 5});
+                return ;
+            }
+
             var idArr = $("#workAccountList tr:visible");
             if(idArr.length<1){
                 parent.layer.msg("请添加报销详情!", {icon: 5});
                 return false;
             }
 
+
             var inputValueList = []
             $("input[name$='.sumMoney']").each(function() {
                 var $sumInput = $(this);
@@ -1207,6 +1218,7 @@
             var list = "${workReimbursement.workAttachmentInvoiceReimbursements}";
             var size = (list.split('url')).length - 1;
             var files = $("#"+ fileValue.id)[0].files;
+            $("#uploadFlag").val(false)
 
             // 判断报销类型是否为电子报销
             for (var i = 0; i < files.length; i++) {
@@ -1276,6 +1288,7 @@
                     return false;
                 }
             }
+            $("#uploadFlag").val(true)
         }
 
         // 处理文件上传
@@ -2340,6 +2353,7 @@
             <form:hidden path="act.procInsId"/>
             <form:hidden path="act.procDefId"/>
             <form:hidden id="flag" path="act.flag"/>
+            <input type="hidden" id="uploadFlag" value="true" />
             <input type="hidden" id="numberFlag" value="${workReimbursement.number}" />
             <input id="wId" type="hidden" value="${workReimbursement.id}">
             <input id="reimbursementType" name="reimbursementType" type="hidden" value="${workReimbursement.reimbursementType}">

src/main/webapp/webpage/modules/workreimbursement/treeForm/new/workReimbursementNewFormAdd.jsp

@@ -648,6 +648,15 @@
                 tableMap["travelDays"] = $("#workAccountList tr").eq(i).find("td").eq(9).text();
                 trArr.push(tableMap);
             }
+            var uploadFlag = $("#uploadFlag").val() === "true";
+            console.log(uploadFlag)
+
+            console.log(typeof uploadFlag)
+            if(!uploadFlag){
+                parent.layer.msg("附件未上传完成，请稍后!", {icon: 5});
+                return ;
+            }
+
             if(obj == 2){
                 $("#inputForm").attr("action","${ctx}/workreimbursement/workReimbursement/store");
             }else{
@@ -1229,6 +1238,7 @@
             var size = (list.split('url')).length - 1;
             var files = $("#"+ fileValue.id)[0].files;
 
+            $("#uploadFlag").val(false)
             // 判断报销类型是否为电子报销
             for (var i = 0; i < files.length; i++) {
                 var file = files[i];
@@ -1299,6 +1309,8 @@
                     return false;
                 }
             }
+
+            $("#uploadFlag").val(true)
         }
 
         // 处理文件上传
@@ -2359,6 +2371,7 @@
             <form:hidden path="id"/>
             <form:hidden path="achivesId"/>
             <form:hidden path="submitterId"/>
+            <input type="hidden" id="uploadFlag" value="true" />
             <input type="hidden" id="numberFlag" value="${workReimbursement.number}" />
             <input id="wId" type="hidden" value="${workReimbursement.id}">
             <input id="reimbursementType" name="reimbursementType" type="hidden" value="${workReimbursement.reimbursementType}">

src/main/webapp/webpage/modules/workreimbursement/treeForm/new/workReimbursementNewModifyApply.jsp

@@ -659,6 +659,16 @@
 
 
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
+
+            var uploadFlag = $("#uploadFlag").val() === "true";
+            console.log(uploadFlag)
+
+            console.log(typeof uploadFlag)
+            if(!uploadFlag){
+                parent.layer.msg("附件未上传完成，请稍后!", {icon: 5});
+                return ;
+            }
+
             var idArr = $("#workAccountList tr:visible");
             if(idArr.length<1){
                 parent.layer.msg("请添加报销详情!", {icon: 5});
@@ -1204,6 +1214,7 @@
             var list = "${workReimbursement.workAttachmentInvoiceReimbursements}";
             var size = (list.split('url')).length - 1;
             var files = $("#"+ fileValue.id)[0].files;
+            $("#uploadFlag").val(false)
 
             // 判断报销类型是否为电子报销
             for (var i = 0; i < files.length; i++) {
@@ -1273,6 +1284,7 @@
                     return false;
                 }
             }
+            $("#uploadFlag").val(true)
         }
 
         // 处理文件上传
@@ -2338,6 +2350,7 @@
             <form:hidden path="act.procInsId"/>
             <form:hidden path="act.procDefId"/>
             <form:hidden id="flag" path="act.flag"/>
+            <input type="hidden" id="uploadFlag" value="true" />
             <input type="hidden" id="numberFlag" value="${workReimbursement.number}" />
             <input id="wId" type="hidden" value="${workReimbursement.id}">
             <input id="reimbursementType" name="reimbursementType" type="hidden" value="${workReimbursement.reimbursementType}">