修复bug

jiangping

2023-08-18 807e22533146d9e1f13a4cf706b9fc62bb204a81

修复bug

 server/pom.xml

@@ -9,7 +9,6 @@
    <packaging>jar</packaging>
    <name>doumeemes</name>
    <description></description>

    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>

 server/src/main/java/doumeemes/dao/business/dto/statistics/ProcedureProcessModel.java

@@ -23,8 +23,7 @@
    private BigDecimal undoneNum;
    @ApiModelProperty(value = "计划数量", example = "1")
    private BigDecimal num;
    @ApiModelProperty(value = "不良品率%", example = "1")
    private BigDecimal  unqualifiedRate;
    @ApiModelProperty(value = "不良品率%", example = "1")    private BigDecimal  unqualifiedRate;
    @ApiModelProperty(value = "物料编码")
    private String materialCode;
    @ApiModelProperty(value = "工序名称")

 server/src/main/java/doumeemes/dao/business/vo/SalaryParamVO.java

@@ -26,16 +26,16 @@
    private Date createTime;

    @ApiModelProperty(value = "主组织编码（关联department表根组织）")
    @ExcelColumn(name="主组织编码（关联department表根组织）")
//    @ExcelColumn(name="主组织编码（关联department表根组织）")
    private Integer rootDepartId;

    @ApiModelProperty(value = "工厂编码（关联department表）")
    @ExcelColumn(name="工厂编码（关联department表）")
//    @ExcelColumn(name="工厂编码（关联department表）")
    @NotEmpty(message = "工厂编码不能为空")
    private Integer departId;

    @ApiModelProperty(value = "工序编码（关联procedure表）")
    @ExcelColumn(name="工序编码（关联procedure表）")
//    @ExcelColumn(name="工序编码（关联procedure表）")
    @NotEmpty(message = "工序编码不能为空")
    private Integer procedureId;


 server/src/main/java/doumeemes/service/ext/impl/StatisticsServiceImpl.java

@@ -127,7 +127,9 @@
                        .add(Constants.formatBigdecimal(model.getQualifiedNum()));
                model.setUndoneNum(Constants.formatBigdecimal(model.getNum()).subtract(doneNum));
                //不良品率
//                model.set
                if(doneNum.compareTo(new BigDecimal(0) )>0){
                    model.setUnqualifiedRate(model.getUnqualifiedNum().divide(doneNum,4).multiply(new BigDecimal(100)));
                }
            }
        }
        return  result;

 server/src/main/resources/mappers/WorkorderRecordExtMapper.xml

@@ -469,7 +469,7 @@
  <select id="salaryStatistic" parameterType="doumeemes.dao.ext.dto.QuerySalaryStatisticDTO" resultType="doumeemes.dao.ext.vo.SalaryStatisticsListVO">
    select `CREATE_USER` as userId ,sum(CASE  WHEN salary_type=0 THEN salary ELSE 0 END ) as jijianSalary
    ,sum(CASE  WHEN salary_type=0 THEN  0 ELSE salary  END ) as jishiSalary
    ,count(distinct(a.workorder_id)) as num
    ,count(distinct(workorder_id)) as num
    ,sum(salary) as totalSalary
    from `workorder_record`
    where `DELETED` =0 and `SALARY` >0