1.统计接口调整

tangzy

2021-07-29 b26fa47a83c05779eb686283f6bde81717ee00e4

1.统计接口调整

 src/main/java/org/springblade/modules/information/controller/InformationController.java

@@ -110,6 +110,8 @@
    @ApiOperation(value = "新增", notes = "传入information")
    public R save(@Valid @RequestBody Information information) {
        Dept dept= new Dept();
        String departmentid = information.getDepartmentid();
        Long l=Long.parseLong(departmentid);
        //自招保安公司
        if(information.getStats().equals("0")){
            Long i = 1420222768149966850L;
@@ -127,6 +129,7 @@
            dept.setDeptName(information.getEnterprisename());
            dept.setAncestors("0,1418458374477549569");
            dept.setDeptCategory(1);

        }
        //保安服务公司
        if(information.getStats().equals("2")){
@@ -146,6 +149,7 @@
            dept.setAncestors("0,1420222961377357825");
            dept.setDeptCategory(1);
        }
        dept.setId(l);
        if (iDeptService.submit(dept)) {
            CacheUtil.clear(SYS_CACHE);
            // 返回懒加载树更新节点所需字段
@@ -723,4 +727,13 @@
        return R.data(maps);
    }

    /**
     * 单位删除
     */
    @PostMapping("/deleteDept")
    public R deleteDept(String ids) {
        informationService.deleteDept(ids);
        return R.success("删除成功");
    }

}

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.java

@@ -68,4 +68,5 @@
    Map<String, String> queryYearKh(String year,String jurisdiction,String deptid);
    Map<String, String> queryYearBanan(String year,String jurisdiction,String deptid);
    Map<String, String> queryYearDe(String year,String jurisdiction,String deptid);
    void deleteDept(String ids);
}

 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml

@@ -795,4 +795,7 @@
            and jurisdiction =#{jurisdiction}
        </if>
    </select>
    <delete id="deleteDept">
        delete from  blade_dept where id=#{ids}
    </delete>
</mapper>

 src/main/java/org/springblade/modules/information/service/IInformationService.java

@@ -68,4 +68,5 @@
    Map selectPcount(String jurisdiction,String deptid);
    Map selectWPcount(String jurisdiction,String deptid);
    List<Map<Object,Object>> selectIn(String jurisdiction);
    void deleteDept(String ids);
}

 src/main/java/org/springblade/modules/information/service/impl/InformationServiceImpl.java

@@ -175,5 +175,10 @@
        return baseMapper.selectIn(jurisdiction);
    }

    @Override
    public void deleteDept(String ids) {
        baseMapper.deleteDept(ids);
    }


}

 src/main/java/org/springblade/modules/performance/entity/Performance.java

@@ -81,6 +81,17 @@
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date time;
    private String departmentid;
    /**
     * 保安身份证号码
     */
    private String cardid;

    /**
     * 服务公司名称
     */
    @TableField("department_name")
    private String departmentName;
    private String jurisdiction;


}

 src/main/java/org/springblade/modules/performance/mapper/PerformanceMapper.xml

@@ -12,6 +12,9 @@
        <result column="score" property="score"/>
        <result column="time" property="time"/>
        <result column="departmentid" property="departmentid"/>
        <result column="jurisdiction" property="jurisdiction"/>
        <result column="departmentName" property="departmentName"/>
        <result column="cardid" property="cardid"/>
    </resultMap>