#

wang..123

2022-03-24 14d82196f6be4297ab4bed18840ded9848b359ef

#

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

@@ -113,10 +113,10 @@
        if (Cools.isEmpty(item)) {
            return R.error("参数为空,请联系管理员");
        }
        item.setType("1");
        if (!item.getType().equals("1")) {
            throw new CoolException("目前仅支持集成项目");
        }
        //item.setType("1");
//        if (!item.getType().equals("1")) {
//            throw new CoolException("目前仅支持集成项目");
//        }
        Item name = itemService.selectOne(new EntityWrapper<Item>()
                .eq("name", item.getName()));
        if (!Cools.isEmpty(name)) {
@@ -139,17 +139,25 @@
    @RequestMapping(value = "/item/update/auth")
    @ManagerAuth
    public R update(Item item){
        EntityWrapper<Item> wapper = new EntityWrapper<Item>();
        Item newitem = itemService.selectOne(wapper.eq("id", item.getId()));
        if (Cools.isEmpty(item)) {
            return R.error("参数为空,请联系管理员");
        }
        item.setType("1");
        if (!item.getType().equals("1")) {
            throw new CoolException("目前仅支持集成项目");
        }
//        item.setType("1");
//        if (!item.getType().equals("1")) {
//            throw new CoolException("目前仅支持集成项目");
//        }
//        item.setRealMonth(1);
//        if (item.getRealMonth() < 0){
//            throw new CoolException("实施周期不可为负数");
//        }
        if(!(newitem.getStartTime()==null || newitem.getEndTime()==null || newitem.getRealStartTime()==null || newitem.getRealEndTime()==null)){
            item.setStartTime(newitem.getStartTime());
            item.setEndTime(newitem.getEndTime());
            item.setRealEndTime(newitem.getRealEndTime());
            item.setRealStartTime(newitem.getRealStartTime());
        }
        item.setUpdateBy(getUserId());
        item.setUpdateTime(new Date());
        itemService.update(item,new EntityWrapper<Item>()

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

@@ -313,6 +313,20 @@
        return R.ok().add(itemsDTOs);
    }


    /**
     * 项目汇总数据
     */
    @RequestMapping("/projectPlan/dataSummary")
    public R dataSummary(){
        dataSummary data = new dataSummary();
        Wrapper<Item> wrapper = new EntityWrapper<>();
        data.setTotalQuantity(itemService.selectCount(wrapper));//项目总共数量
        data.setIntoSum(itemService.selectCount(wrapper.eq("type","10")));//集成项目数
        data.setWrongInto(itemService.selectCount(wrapper.ne("type","10")));//非集成项目数
        data.setInspected(itemService.selectCount(wrapper.eq("realLADate","").and().eq("realLADate",null)));//已验收项目数量
        data.setWrongInspected(itemService.selectCount(wrapper.ne("realLADate",null)));//未验收项目数量
        data.setFinished(itemService.selectCount(wrapper.ne("realinDate", null).eq("realLADate", null)));//已完工未验收数量
        return R.ok().add(data);
    }

}

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

New file
@@ -0,0 +1,14 @@
package zy.cloud.wms.manager.entity;

import lombok.Data;

@Data
public class dataSummary {
    private Integer totalQuantity;//项目总共数量
    private Integer intoSum;//集成项目数
    private Integer wrongInto;//非集成项目数
    private Integer inspected;//已验收项目数量
    private Integer wrongInspected;//未验收项目数量
    private Integer finished;//已完工未验收数量

}

 src/main/webapp/views/item/item.html

@@ -57,9 +57,9 @@
        <div class="layui-row">
            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">项目编号: </label>
                    <label class="layui-form-label">项目编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="uuid" placeholder="请输入项目编号" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="uuid" placeholder="请输入项目编号" >
                    </div>
                </div>
                <div class="layui-form-item">

 src/main/webapp/views/itemBusiness/itemBusiness.html

@@ -57,9 +57,9 @@
        <div class="layui-row">
            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">项目编号: </label>
                    <label class="layui-form-label">项目编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="uuid" placeholder="请输入项目编号" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="uuid" placeholder="请输入项目编号">
                    </div>
                </div>
                <div class="layui-form-item">

 src/main/webapp/views/itemManager/itemManager.html

@@ -57,9 +57,9 @@
        <div class="layui-row">
            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">项目编号: </label>
                    <label class="layui-form-label">项目编号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="uuid" placeholder="请输入项目编号" lay-vertype="tips" lay-verify="required">
                        <input class="layui-input" name="uuid" placeholder="请输入项目编号">
                    </div>
                </div>
                <div class="layui-form-item">
@@ -77,7 +77,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">预计安装日期: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="" id="planinDate" placeholder="请输入预计安装日期" lay-vertype="tips">
                        <input class="layui-input" name="planinDate" id="planinDate"  placeholder="请输入预计安装日期" lay-vertype="tips">
                    </div>
                </div>
                <div class="layui-form-item">