修复bug

jiangping

2023-08-18 ba682942eba9618f17b1af2665c97390320abdd4

修复bug

 server/src/main/java/doumeemes/service/business/impl/SalaryParamServiceImpl.java

@@ -265,7 +265,7 @@
            salaryParam.setRootDepartId(department.getRootId());
            salaryParam.setDepartId(department.getId());
            salaryParam.setProcedureId(procedures.getId());
            salaryParam.setMaterialId(materialDistribute1.getId());
            salaryParam.setMaterialId(materialDistribute.getId());
            salaryParam.setSalary(salaryParamImportDTO.getSalary());
            salaryParam.setNum(new BigDecimal(salaryParamImportDTO.getNum()));
            salaryParam.setTimes(getIntegerTimes(salaryParamImportDTO.getTimesName()));

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

@@ -548,38 +548,7 @@
  </select>
  <select id="selectListNew" parameterType="doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO" resultMap="WorkorderRecordExtListVO">
    SELECT
      `a`.`ID`,
      `a`.`DELETED`,
      `a`.`CREATE_USER`,
      `a`.`CREATE_TIME`,
      `a`.`UPDATE_USER`,
      `a`.`UPDATE_TIME`,
      `a`.`REMARK`,
      `a`.`ROOT_DEPART_ID`,
      `a`.`DEPART_ID`,
      `a`.`PLAN_ID`,
      `a`.`WORKORDER_ID`,
      `a`.`BATCH`,
      `a`.`FACTORY_ID`,
      `a`.`PROCEDURE_ID`,
      `a`.`PRO_DEVICE_ID`,
      `a`.`APPLIANCES_ID`,
      `a`.`PRO_DATE`,
      `a`.`TYPE`,
      `a`.`NUM`,
      `a`.`DONE_TYPE`,
      `a`.`MATERIAL_ID`,
      `a`.`UNIT_ID`,
      `a`.`MATERIAL_BATCH`,
      `a`.`CHECK_WAY`,
      `a`.`CHECK_USER_ID`,
      `a`.`QUALIFIED_NUM`,
      `a`.`UNQUALIFIED_NUM`,
      `a`.`CHECK_DATE`,
      `a`.`CHECK_INFO`,
      `a`.`QUALIFIED_APPLIANCE_ID`,
      `a`.`PRO_USERIDS`,
    `a`.MATERIAL_DONETYPE,`a`.MATERIAL_PROCEDURE_ID,`a`.RELOBJ_ID,`a`.RELOBJ_TYPE,
      `a`.*,
      `dmodel`.`ID` AS DMODEL_ID,
      `dmodel`.`DELETED` AS DMODEL_DELETED,
      `dmodel`.`CREATE_USER` AS DMODEL_CREATE_USER,