修改月度结算页面

src/main/java/cn/palmte/work/controller/backend/MonthlySettleController.java

@@ -69,6 +69,9 @@ public class MonthlySettleController extends BaseController {
     @RequestMapping("/infoByTime")
     public String infoByTime(@RequestParam String month, @RequestParam("projectName") String projectName, Map<String, Object> model) {
         MonthlySettle monthlySettle = monthlySettleRepository.findByMonthAndProjectName(month, projectName);
+        if (monthlySettle == null) {
+            monthlySettle = new MonthlySettle();
+        }
         model.put("monthlySettle", monthlySettle);
         model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
         return "/admin/monthly_settle_info";

src/main/java/cn/palmte/work/service/MonthlySettleService.java

@@ -322,11 +322,11 @@ public class MonthlySettleService {
     }
 
     private QueryHelper getQueryHelper(Map<String, String> searchInfo) {
-        QueryHelper queryHelper = new QueryHelper("SELECT *","(select project_name as name, max(ms.month) as time from monthly_settle ms group by ms.project_name)","ms");
+        QueryHelper queryHelper = new QueryHelper("SELECT s.*, ms.*","(select project_name as name, max(ms.month) as time from monthly_settle ms group by ms.project_name)","ms");
         queryHelper.leftJoin("monthly_settle s", "ms.time = s.month and ms.name = s.project_name");
 
         queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("projectNo")),"s.project_no LIKE ?", "%"+searchInfo.get("projectNo")+"%");
-        queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("name")),"s.name LIKE ?", "%"+searchInfo.get("name")+"%");
+        queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("name")),"s.project_name LIKE ?", "%"+searchInfo.get("name")+"%");
         queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("owner")),"s.owner LIKE ?", "%"+searchInfo.get("owner")+"%");
         queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("contractParty")),"s.contract_party LIKE ?", "%"+searchInfo.get("contractParty")+"%");
         queryHelper.addCondition(StrUtil.isNotEmpty(searchInfo.get("contractNo")),"s.contract_no LIKE ?", "%"+searchInfo.get("contractNo")+"%");
@@ -337,18 +337,18 @@ public class MonthlySettleService {
 
         if(StrUtil.isNotEmpty(searchInfo.get("startTime"))){
             String time = searchInfo.get("startTime") + " 00:00:00";
-            queryHelper.addCondition("s.start_time>=?", time);
+            queryHelper.addCondition("s.collect_actual_time>=?", time);
         }
         if(StrUtil.isNotEmpty(searchInfo.get("endTime"))){
-            String time = searchInfo.get("endTime") + " 00:00:00";
+            String time = searchInfo.get("endTime") + " 23:59:59";
-            queryHelper.addCondition("s.end_time<=?", time);
+            queryHelper.addCondition("s.collect_actual_time<=?", time);
         }
         if(StrUtil.isNotEmpty(searchInfo.get("contractStartTime"))){
             String time = searchInfo.get("contractStartTime") + " 00:00:00";
             queryHelper.addCondition("s.contract_time>=?", time);
         }
         if(StrUtil.isNotEmpty(searchInfo.get("contractEndTime"))){
-            String time = searchInfo.get("contractEndTime") + " 00:00:00";
+            String time = searchInfo.get("contractEndTime") + " 23:59:59";
             queryHelper.addCondition("s.contract_time<=?", time);
         }
 

src/main/resources/templates/admin/monthly_settle_info.ftl

@@ -111,7 +111,7 @@
             <div class="am-tabs am-margin" data-am-tabs>
                 <div class="am-tabs-bd">
                     <div class="am-tab-panel am-fade am-in am-active" id="tab1">
-                        <input name="id" id="id" type="hidden" value="${monthlySettle.id}" />
+                        <input name="id" id="id" type="hidden" value="${monthlySettle.id!}" />
 <#--                        <div class="am-u-sm-10">-->
 <#--                            <div class="am-form am-form-inline">-->
 <#--                                <div class="am-form-group am-form-icon">-->
@@ -126,7 +126,7 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px; margin-bottom: 13px;" value="月份(请选择)"></div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input readonly id="time" name="time" value="${monthlySettle.month}"></input>
+                                <input readonly id="time" name="time" value="${monthlySettle.month!}"></input>
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                         </div>
@@ -182,7 +182,7 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 134px ;margin-bottom: 6px;" value="合同签订时间"></div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input readonly id="contractSignTime" value="${monthlySettle.contractSignTime?string("yyyy-MM-dd")}"></input>
+                                <input readonly id="contractSignTime" value="${(monthlySettle.contractSignTime?string("yyyy-MM-dd"))!}"></input>
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                         </div>
@@ -262,7 +262,7 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: -15px" value="收款要求时间"></div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input readonly value="${monthlySettle.contractSignTime?string("yyyy-MM-dd")}"></input>
+                                <input readonly value="${(monthlySettle.contractSignTime?string("yyyy-MM-dd"))!}"></input>
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                         </div>
@@ -278,7 +278,7 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;margin-left: -15px" value="实际收款时间"></div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input readonly value="${monthlySettle.collectActualTime?string("yyyy-MM-dd")}"></input>
+                                <input readonly value="${(monthlySettle.collectActualTime?string("yyyy-MM-dd"))!}"></input>
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                         </div>
@@ -318,7 +318,7 @@
                         <div class="am-g am-form-group am-margin-top">
                             <div class="am-u-sm-4 am-u-md-2 am-text-right"><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="验收报告时间"></div>
                             <div class="am-u-sm-6 am-u-md-6">
-                                <input readonly value="${monthlySettle.inspectionReportTime?string("yyyy-MM-dd")}" />
+                                <input readonly value="${(monthlySettle.inspectionReportTime?string("yyyy-MM-dd"))!}" />
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                         </div>
@@ -378,7 +378,7 @@
                 var projectName = $("#projectName").val();
                 var time = $(this.elem).val();
                 console.log("time:" + time)
-                $("#pmsForm").attr("action","${base}/monthlySettle/infoByTime?projectName=" + projectName + "&month=2022-07&listFrom=list");
+                $("#pmsForm").attr("action","${base}/monthlySettle/infoByTime?projectName=" + projectName + "&month=" + time + "&listFrom=list");
                 $("#pmsForm").submit();
             }
         });

src/main/resources/templates/admin/monthly_settle_list.ftl

@@ -245,28 +245,28 @@
         </footer>
     </div>
 </@defaultLayout.layout>
-<script type="text/javascript" src="${base}/common/js/jquery.ajaxfileupload.js"></script>
+<script type="text/javascript" src="../common/js/jquery.ajaxfileupload.js"></script>
-<script src="${base}/common/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>
+<script src="../common/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>
-<script type="text/javascript" src="${base}/common/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>
+<script type="text/javascript" src="../common/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>
-<script type="text/javascript" src="${base}/common/jQuery-File-Upload/js/jquery.fileupload.js"></script>
+<script type="text/javascript" src="../common/jQuery-File-Upload/js/jquery.fileupload.js"></script>
-<script src="${base}/common/jQuery-File-Upload/js/jquery.fileupload-process.js"></script>
+<script src="../common/jQuery-File-Upload/js/jquery.fileupload-process.js"></script>
-<script src="${base}/common/jQuery-File-Upload/js/jquery.fileupload-validate.js"></script>
+<script src="../common/jQuery-File-Upload/js/jquery.fileupload-validate.js"></script>
 <script src="../assets/js/amazeui.switch.js"></script>
 <script src="${base}/layui/layui.js"></script>
 <script type="text/javascript">
-    // layui.use('laydate', function(){
+    layui.use('laydate', function(){
-    //     var laydate = layui.laydate;
+        var laydate = layui.laydate;
-    //
+
-    //     laydate.render({
+        laydate.render({
-    //         elem: '#time',
+            elem: '#time',
-    //         type: 'month',
+            type: 'month',
-    //         btns: ['confirm'],
+            btns: ['confirm'],
-    //         trigger: 'click',
+            trigger: 'click',
-    //         ready: function(date){
+            ready: function(date){
-    //             console.log(date);
+                console.log(date);
-    //         }
+            }
-    //     });
+        });
-    // });
+    });
 
     function windows() {
         layui.use('layer', function(){
@@ -275,7 +275,7 @@
                 '<input id="doc-form-file" type="file" name="file" onChange="ajaxUploadFile(\'doc-form-file\',\'${base}/monthlySettle/batchImport\')">'
             layer.open({
                 type: 1,
-                title: "请选择导入的月份",
+                title: "选择导入时间",
                 offset: '0px',
                 id: 'layerDemo',
                 content: html,
@@ -296,8 +296,10 @@
     };
 
     function ajaxUploadFile(id, url) {
+        var date = $("#layTime").val();
+        console.log("date:" + date);
         $.ajaxFileUpload({
-            url: url,
+            url: url + '?date=' + date,
             secureuri: false,
             fileElementId: id,// file标签的id
             dataType: 'json',// 返回数据的类型
@@ -324,9 +326,6 @@
             error: function (data, status, e) {
                 console.log("--------error---------" + data)
                 alert("-----------------" + data);
-                // if ($('#modal')) {
-                //     $('#modal').modal('close');
-                // }
                 alert(e);
                 $("#" + id).val("");
             }