Merge remote-tracking branch 'origin/master'

zhoushihao

2024-10-11 d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java

@@ -53,6 +53,11 @@
    @Resource
    WorkAssignmentMapper workAssignmentMapper;

    @Override
    public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) {
        return null;
    }

    /**
     * 查询报工信息
     */
@@ -201,7 +206,7 @@
            }
            if (damage.getType() == 1) {
                if (submitReport(damage)) {
                    damage.setStatus(2);
                    damage.setStatus(3);
                } else {
                    damage.setStatus(1);
                }