# ycq

whycq0520

2022-03-24 228baf7c1c851ee8eba6d4da1e3f459f4d6a98e0

# ycq

 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java

@@ -295,6 +295,11 @@
            itemsDTO.setId(item.getName());
            itemsDTO.setStartDay(item.getStartTime$());
            itemsDTO.setEndDay(item.getEndTime$());
            itemsDTO.setPresaleAmt(item.getPresaleAmt());
            itemsDTO.setPlandeAmt(item.getPlandeAmt());
            itemsDTO.setRealdeAmt(item.getRealdeAmt());
            itemsDTO.setPlaninAmt(item.getPlaninAmt());
            itemsDTO.setRealinAmt(item.getRealinAmt());
            List<ProjectPlan> allPlans = projectPlanService.selectList(new EntityWrapper<ProjectPlan>()
                    .eq("item_id", item.getId()));
            for (ProjectPlan projectPlan : allPlans) {
@@ -307,7 +312,6 @@
                flows.add(flowsDTO);
            }
            itemsDTO.setNodes(flows);
            itemsDTO.setItems(items);
            itemsDTOs.add(itemsDTO);
        }
        return R.ok().add(itemsDTOs);

 src/main/java/zy/cloud/wms/manager/entity/ItemsDTO.java

@@ -13,5 +13,9 @@
    private String startDay;
    private String endDay;
    private List<FlowsDTO> nodes;
    private List<Item> items;
    private Double presaleAmt;
    private Double plandeAmt;
    private Double realdeAmt;
    private Double planinAmt;
    private Double realinAmt;
}

 src/main/resources/application.yml

@@ -17,7 +17,7 @@
#    url: jdbc:sqlserver://127.0.0.1:51433;databasename=zypms
#    username: sa
#    password: Zoneyung@zy56$
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
    url: jdbc:sqlserver://localhost:1433;databasename=zypms
    username: sa
    password: sa@123
  mvc:

 src/main/webapp/static/js/tableData.js

@@ -9,7 +9,7 @@
    
    var proData = ["项目名称","售前金额核算","开始时间","结束时间",
        "合约签订","图面会签","BOM设计/二级BOM下发",
        "材料采购","生产制作","内部安装调整（研发物料）","进场安装","程序调试","系统联调","上线运行","项目验收","运费"]
        "材料采购","生产制作","内部安装调整（研发物料）","进场安装","程序调试","系统联调","上线运行","项目验收","运费","安装费"]
    var getTheaddData = function(){
            for (var i = 0;i < proData.length; i++) {
                var str = "<th class='xiangmu'>"+proData[i]+"</th>"
@@ -47,7 +47,6 @@
            dataType:'JSON',
            data:{},
            success:function(res){
                console.log(res)
                if(res.code==200){
                    data=res.data
                    // 判断时间是否有null  有null的改为 ""
@@ -80,11 +79,25 @@
                        }
                        var str2 = '<tr id="row'+i+'" class="row">'
                            +'<th class="projects">'+data[i].id+'</th>'
                            +'<td class="nor-mal">'+data[i].startDay.substring(0,10)+'</td>'
                            +'<td class="nor-mal">'+data[i].presaleAmt+'</td>'
                            +'<td class="nor-mal">'+data[i].startDay.substring(0,10)+'</td>'
                            +'<td class="nor-mal">'+data[i].endDay.substring(0,10)+'</td>'
                        var str3 =  str2 +str +'</tr>'
                        var str9 = '<td class="normal">'+'<p>'+data[i].plandeAmt+'</p>'+'<p>'+data[i].realdeAmt+'</p>'+'</td>'
                                +  '<td class="normal">'+'<p>'+data[i].planinAmt+'</p>'+'<p>'+data[i].realinAmt+'</p>'+'</td>'
                        var str3 =  str2 +str + str9 +'</tr>'
                        $('#tab-body').append(str3)
                        var deAmt = data[i].plandeAmt - data[i].realdeAmt
                        if (deAmt < 0 ) {
                            $("#tab-body").find('tr').eq(i).find("td").eq(14).attr("style","background:#CC3333");
                        } else {
                            $("#tab-body").find('tr').eq(i).find("td").eq(14).attr("style","background:#009966");
                        }
                        var inAmt = data[i].planinAmt - data[i].realinAmt
                        if (inAmt < 0 ) {
                            $("#tab-body").find('tr').eq(i).find("td").eq(15).attr("style","background:#CC3333 ");
                        } else {
                            $("#tab-body").find('tr').eq(i).find("td").eq(15).attr("style","background:#009966");
                        }
                    }
                    var dataLen = data.length
                    for(var t = 0;t < dataLen; t++){
@@ -104,13 +117,13 @@
                                var ExDay = eDay.getTime()-myDate.getTime()

                                if(ExDay>-86400000 && ExDay<172800000){
                                    $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC9933");
                                    $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#CC9933");

                                }else if(ExDay<-86400000){
                                    $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC3333");
                                    $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#CC3333");

                                }else if(ExDay>172800000){
                                    $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#2e4e7e")
                                    $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#2e4e7e")
                                }
                            }else{
                                function tab(date1,date2){
@@ -118,10 +131,10 @@
                                    var oDate2 = new Date(date2);
                                    var x = oDate1.getTime()-oDate2.getTime()
                                    if(x>=0){
                                        $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#009966")
                                        $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#009966")

                                    } else {
                                        $("#tab-body").find('tr').eq(t).find("td").eq(k+2).attr("style","background:#CC3333");
                                        $("#tab-body").find('tr').eq(t).find("td").eq(k+3).attr("style","background:#CC3333");

                                    }
                                }