ANDRU-PC\Andru
2021-12-13 52e01ab55af06db4ecb5792a54fb7033635e1f3e
划扣表字段修改
6个文件已修改
51 ■■■■ 已修改文件
phi_platform_common/src/main/resources/mapper/ComparePhotoRecordMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/resources/mapper/DeductionProjectMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/AutoDomeUtil.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/deduction/controller/DeductionController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSingleServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_user/src/main/java/com/hx/phip/dto/DeductionDto.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
phi_platform_common/src/main/resources/mapper/ComparePhotoRecordMapper.xml
@@ -8,7 +8,7 @@
    <!-- 整个实体类修改,表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,userId = #{userId},projectId = #{projectId},projectFrequency = #{projectFrequency},type = #{type},remark = #{remark},deductionProjectId = #{deductionProjectId},deductionSingleId = #{deductionSingleId},isDel = #{isDel},createTime = #{createTime}
            ,userId = #{userId},projectId = #{projectId},projectFrequency = #{projectFrequency},type = #{type},remark = #{remark},userProjectId = #{userProjectId},deductionProjectId = #{deductionProjectId},deductionSingleId = #{deductionSingleId},isDel = #{isDel},createTime = #{createTime}
        </trim>
    </sql>
     
@@ -19,7 +19,7 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into compare_photo_record (id,userId,projectId,projectFrequency,type,remark,deductionProjectId,deductionSingleId,isDel,createTime)  values (#{id},#{userId},#{projectId},#{projectFrequency},#{type},#{remark},#{deductionProjectId},#{deductionSingleId},#{isDel},#{createTime})
        insert into compare_photo_record (id,userId,projectId,projectFrequency,type,remark,userProjectId,deductionProjectId,deductionSingleId,isDel,createTime)  values (#{id},#{userId},#{projectId},#{projectFrequency},#{type},#{remark},#{userProjectId},#{deductionProjectId},#{deductionSingleId},#{isDel},#{createTime})
    </insert>
    <select id="selectList" resultType="com.hx.phiappt.model.ComparePhotoRecord" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -51,14 +51,14 @@
    <select id="selectOneByKey" resultType="com.hx.phiappt.model.ComparePhotoRecord" parameterType="java.lang.Object" >
        select 
            id,userId,projectId,projectFrequency,type,remark,deductionProjectId,deductionSingleId,isDel,createTime
            id,userId,projectId,projectFrequency,type,remark,userProjectId,deductionProjectId,deductionSingleId,isDel,createTime
        from compare_photo_record
        WHERE id = #{value}
    </select>
    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.ComparePhotoRecord" parameterType="java.lang.Object" >
        select 
            id,userId,projectId,projectFrequency,type,remark,deductionProjectId,deductionSingleId,isDel,createTime
            id,userId,projectId,projectFrequency,type,remark,userProjectId,deductionProjectId,deductionSingleId,isDel,createTime
        from compare_photo_record
        WHERE id = #{value}
    </select>
phi_platform_common/src/main/resources/mapper/DeductionProjectMapper.xml
@@ -8,7 +8,7 @@
    <!-- 整个实体类修改,表字段=实体类字段-->
    <sql id="Update_Column_All">
        <trim prefixOverrides=",">
            ,projectNo = #{projectNo},projectName = #{projectName},price = #{price},num = #{num},familiesRoomName = #{familiesRoomName},specification = #{specification},useDuration = #{useDuration},palsyDuration = #{palsyDuration},projectId = #{projectId},deductionSingleId = #{deductionSingleId},executeStartTime = #{executeStartTime},executeEndTime = #{executeEndTime},remarkInfo = #{remarkInfo},isDel = #{isDel},createTime = #{createTime}
            ,projectNo = #{projectNo},projectName = #{projectName},price = #{price},num = #{num},shopId = #{shopId},shopName = #{shopName},departmentCode = #{departmentCode},departmentName = #{departmentName},specification = #{specification},useDuration = #{useDuration},palsyDuration = #{palsyDuration},projectId = #{projectId},deductionSingleId = #{deductionSingleId},executeStartTime = #{executeStartTime},executeEndTime = #{executeEndTime},remarkInfo = #{remarkInfo},isDel = #{isDel},createTime = #{createTime}
        </trim>
    </sql>
     
@@ -19,7 +19,7 @@
        <selectKey keyProperty="id" resultType="String" order="BEFORE">
               select replace(uuid(),'-','') from dual
        </selectKey>
        insert into deduction_project (id,projectNo,projectName,price,num,familiesRoomName,specification,useDuration,palsyDuration,projectId,deductionSingleId,executeStartTime,executeEndTime,remarkInfo,isDel,createTime)  values (#{id},#{projectNo},#{projectName},#{price},#{num},#{familiesRoomName},#{specification},#{useDuration},#{palsyDuration},#{projectId},#{deductionSingleId},#{executeStartTime},#{executeEndTime},#{remarkInfo},#{isDel},#{createTime})
        insert into deduction_project (id,projectNo,projectName,price,num,shopId,shopName,departmentCode,departmentName,specification,useDuration,palsyDuration,projectId,deductionSingleId,executeStartTime,executeEndTime,remarkInfo,isDel,createTime)  values (#{id},#{projectNo},#{projectName},#{price},#{num},#{shopId},#{shopName},#{departmentCode},#{departmentName},#{specification},#{useDuration},#{palsyDuration},#{projectId},#{deductionSingleId},#{executeStartTime},#{executeEndTime},#{remarkInfo},#{isDel},#{createTime})
    </insert>
    <select id="selectList" resultType="com.hx.phiappt.model.deduction.DeductionProject" parameterType="com.hx.mybatisTool.SqlSentence" >
@@ -51,14 +51,14 @@
    <select id="selectOneByKey" resultType="com.hx.phiappt.model.deduction.DeductionProject" parameterType="java.lang.Object" >
        select 
            id,projectNo,projectName,price,num,familiesRoomName,specification,useDuration,palsyDuration,projectId,deductionSingleId,executeStartTime,executeEndTime,remarkInfo,isDel,createTime
            id,projectNo,projectName,price,num,shopId,shopName,departmentCode,departmentName,specification,useDuration,palsyDuration,projectId,deductionSingleId,executeStartTime,executeEndTime,remarkInfo,isDel,createTime
        from deduction_project
        WHERE id = #{value}
    </select>
    <select id="selectOneByKeyBlob" resultType="com.hx.phiappt.model.deduction.DeductionProject" parameterType="java.lang.Object" >
        select 
            id,projectNo,projectName,price,num,familiesRoomName,specification,useDuration,palsyDuration,projectId,deductionSingleId,executeStartTime,executeEndTime,remarkInfo,isDel,createTime
            id,projectNo,projectName,price,num,shopId,shopName,departmentCode,departmentName,specification,useDuration,palsyDuration,projectId,deductionSingleId,executeStartTime,executeEndTime,remarkInfo,isDel,createTime
        from deduction_project
        WHERE id = #{value}
    </select>
phi_platform_user/src/main/java/com/hx/phip/AutoDomeUtil.java
@@ -30,7 +30,7 @@
        String controllerPackRootResourse = "phi_platform_user.src.main.resources";
        // 替换此处名字
        Class<?> clas = DeductionSign.class;
        Class<?> clas = DeductionProject.class;
        // 获取对象生成的上层包名
        String objectPackageName = clas.getPackage().getName();
phi_platform_user/src/main/java/com/hx/phip/deduction/controller/DeductionController.java
@@ -58,8 +58,12 @@
            throw new PlatTipsException(PlatformCode.ERROR_TIPS,"数量/划扣次数需要大于0");
        }
        if(StringUtils.isEmpty(deductionDto.getFamiliesRoomName())){
            throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"科室不能为空");
        if(deductionDto.getExecuteStartTime() == null){
            throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"执行开始时间不内为空!");
        }
        if(deductionDto.getExecuteEndTime() == null){
            throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"执行结束时间不内为空!");
        }
    }
}
phi_platform_user/src/main/java/com/hx/phip/deduction/service/impl/DeductionSingleServiceImpl.java
@@ -128,7 +128,10 @@
            deductionProject.setProjectName(project.getName());
            deductionProject.setPrice(project.getPrice());
            deductionProject.setNum(deductionDto.getDeductionNum());
            deductionProject.setFamiliesRoomName(deductionDto.getFamiliesRoomName());
            deductionProject.setShopId("1");
            deductionProject.setShopName("1");
            deductionProject.setDepartmentCode("1");
            deductionProject.setDepartmentName("1");
            deductionProject.setSpecification(project.getSpecification());
            deductionProject.setUseDuration(project.getUseDuration());
            deductionProject.setPalsyDuration(project.getPalsyDuration());
@@ -305,6 +308,7 @@
                    comparePhotoRecord.setUserId(deductionSingle.getUserId());
                    comparePhotoRecord.setProjectId(deductionProject.getProjectId());
                    comparePhotoRecord.setProjectFrequency(0);
                    comparePhotoRecord.setUserProjectId(userProject.getId());
                    comparePhotoRecord.setDeductionProjectId(deductionProject.getId());
                    comparePhotoRecord.setDeductionSingleId(deductionSingle.getId());
                    int insert = commonDao.insert(ComparePhotoRecordMapper.class, comparePhotoRecord);
phi_platform_user/src/main/java/com/hx/phip/dto/DeductionDto.java
@@ -24,9 +24,6 @@
    // 数量/划扣次数
    private Integer deductionNum = 0;
    // 科室
    private String familiesRoomName;
    // 执行开始时间
    private Date executeStartTime;
@@ -57,16 +54,16 @@
        return userProjectId;
    }
    public void setUserProjectId(String userProjectId) {
        this.userProjectId = userProjectId;
    }
    public String getRemarkInfo() {
        return remarkInfo;
    }
    public void setRemarkInfo(String remarkInfo) {
        this.remarkInfo = remarkInfo;
    }
    public void setUserProjectId(String userProjectId) {
        this.userProjectId = userProjectId;
    }
    public String getSourceCode() {
@@ -91,14 +88,6 @@
    public void setDeductionNum(Integer deductionNum) {
        this.deductionNum = deductionNum;
    }
    public String getFamiliesRoomName() {
        return familiesRoomName;
    }
    public void setFamiliesRoomName(String familiesRoomName) {
        this.familiesRoomName = familiesRoomName;
    }
    public Date getExecuteStartTime() {