Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/ma/vo/MaType.java

@@ -216,6 +216,9 @@ public class MaType extends BaseEntity {
     @ApiModelProperty(value = "推送智慧工程定义的门类分类机具编码")
     private String intelligentCode;
 
+    @ApiModelProperty(value = "检修记录预报警天数")
+    private Integer maintenanceAlarmDay;
+
     private List<Integer> typeIds;
 
     private List<MaTypeProperty> maTypeProperties;

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java

@@ -64,6 +64,9 @@ public class OrderDetailDto {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date rentEndTime;
 
+    @ApiModelProperty(value = "订单原始天数")
+    private String originDays;
+
     @ApiModelProperty(value = "天数")
     private String days;
 

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java

@@ -111,6 +111,7 @@ public class OrderServiceImpl implements OrderService {
             BigDecimal totalReliefPrice = BigDecimal.ZERO;
             for (OrderDetailDto detailDto : list) {
                 if (Objects.nonNull(detailDto) && String.valueOf(OrderStatusEnum.ORDER_FINISHED.getStatus()).equals(detailDto.getOrderStatus())) {
+                    detailDto.setOriginDays(detailDto.getDays());
                     detailDto.setDays(detailDto.getDateDays() == null ? detailDto.getDays() : String.valueOf(detailDto.getDateDays()));
                     if (detailDto.getChangeCost() != null) {
                         totalRentalPrice = totalRentalPrice.add(detailDto.getChangeCost());

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/ma/MaMachineTypeMapper.xml

@@ -33,10 +33,14 @@
         <result property="remark"    column="remark"    />
         <result property="childPhoto"    column="childPhoto"    />
         <result property="intelligentCode"    column="intelligent_code"    />
+        <result property="maintenanceAlarmDay"    column="maintenance_alarm_day"    />
     </resultMap>
 
     <sql id="selectMaTypeVo">
-        select type_id, type_name, parent_id, storage_num, company_id, code, unit_id, unit_name, manage_type, lease_price, eff_time, rent_price, buy_price, pay_price, level, rated_load, test_load, holding_time, warn_num, del_flag, create_by, create_time, update_by, update_time, is_plan, is_ancuo, remark,intelligent_code ,fac_model, child_photo from ma_type
+        select type_id, type_name, parent_id, storage_num, company_id, code, unit_id, unit_name, manage_type,
+               lease_price, eff_time, rent_price, buy_price, pay_price, level, rated_load, test_load, holding_time,
+               warn_num, del_flag, create_by, create_time, update_by, update_time, is_plan, is_ancuo, remark,
+               intelligent_code, maintenance_alarm_day, fac_model, child_photo from ma_type
     </sql>
 
     <insert id="insertType" parameterType="com.bonus.material.ma.vo.MaType" useGeneratedKeys="true" keyProperty="typeId">
@@ -70,6 +74,7 @@
             <if test="remark != null">remark,</if>
             <if test="facModel != null">fac_model,</if>
             <if test="intelligentCode != null">intelligent_code,</if>
+            <if test="maintenanceAlarmDay != null">maintenance_alarm_day,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="typeName != null and typeName != ''">#{typeName},</if>
@@ -100,6 +105,7 @@
             <if test="remark != null">#{remark},</if>
             <if test="facModel != null">#{facModel},</if>
             <if test="intelligentCode != null">#{intelligentCode},</if>
+            <if test="maintenanceAlarmDay != null">#{maintenanceAlarmDay},</if>
         </trim>
     </insert>
 
@@ -157,6 +163,7 @@
             <if test="companyId != null">company_id = #{companyId},</if>
             <if test="facModel != null">fac_model = #{facModel},</if>
             <if test="intelligentCode != null">intelligent_code = #{intelligentCode},</if>
+            <if test="maintenanceAlarmDay != null">maintenance_alarm_day = #{maintenanceAlarmDay},</if>
         </trim>
         where type_id = #{typeId}
     </update>
@@ -180,7 +187,7 @@
         m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
         mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
         su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
-        m.remark, m.company_id ,m.type_id id , m.type_name label
+        m.remark, m.company_id ,m.type_id id , m.type_name label, m.maintenance_alarm_day
         from ma_type m
         left join ma_prop_set mps on m.type_id = mps.type_id and mps.`status`='0' and mps.del_flag='0'
         left join ma_prop_info mpi on mps.prop_id = mpi.prop_id and mpi.`status`='0' and mpi.del_flag='0'
@@ -286,7 +293,7 @@
                mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
                su.nick_name keeperUserName, mtr.user_id repairUserId, su1.nick_name repairUserName,mpi.prop_id as propId, mpi.prop_name as propName,
                m.del_flag, m.create_by, m.create_time,
-               m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code
+               m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code, m.maintenance_alarm_day
         from ma_type m
                  left join ma_prop_set mps on m.type_id = mps.type_id
                  left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
@@ -320,7 +327,7 @@
         select m.type_id, m.type_name, m.parent_id, m.storage_num, m.unit_id, m.manage_type,
                m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
                m.holding_time, m.warn_num, m.del_flag, m.create_by, m.create_time,
-               m.remark, m.company_id
+               m.remark, m.company_id, m.maintenance_alarm_day
         from ma_type m
         where level != 4 and del_flag = '0'
     </select>
@@ -328,7 +335,7 @@
         select m.type_id, m.type_name, m.parent_id, m.storage_num, m.unit_id, m.manage_type,
         m.lease_price,m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
         m.holding_time, m.warn_num, m.del_flag, m.create_by, m.create_time,
-        m.remark, m.company_id
+        m.remark, m.company_id, m.maintenance_alarm_day
         from ma_type m
         <where>
             m.del_flag = '0'
@@ -341,7 +348,7 @@
         m.holding_time, m.warn_num, mtf.file_name photoName, mtf.file_url photoUrl,
         mtf2.file_name documentName, mtf2.file_url documentUrl, mtk.user_id keeperUserId,
         su.nick_name keeperUserName, mpi.prop_name, m.del_flag, m.create_by, m.create_time,
-        m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code
+        m.remark, m.company_id,m.fac_model as facModel,m.intelligent_code, m.maintenance_alarm_day
         from ma_type m
         left join ma_prop_set mps on m.type_id = mps.type_id
         left join ma_prop_info mpi on mps.prop_id = mpi.prop_id
@@ -358,7 +365,7 @@
     <select id="selectMaTypeTreeByLevel" resultMap="MaTypeResult" parameterType="java.lang.String">
         select m.type_id, m.type_name, m.parent_id, m.storage_num, m.unit_id, m.manage_type,
         m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load,
-        m.holding_time, m.warn_num, m.del_flag, m.create_by, m.create_time,
+        m.holding_time, m.warn_num, m.del_flag, m.create_by, m.create_time, m.maintenance_alarm_day,
         m.remark, m.company_id,mtf.file_url photoUrl
         from ma_type m
         left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id
@@ -390,6 +397,7 @@
         m.create_time,
         m.remark,
         m.company_id,
+        m.maintenance_alarm_day,
         mtf.file_url photoUrl,
         mt.photoUrl as childPhoto
         FROM