Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-11-29 3707ace2281019ed0421b59674fc549020239903

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 hd/pipe/StaffManage/src/main/resources/mapping/PlatUserMapper.xml

@@ -114,7 +114,7 @@
                </if>
            </trim>
        </where>

        order by spu.create_time desc
    </select>

    <select id="queryForPullDownDorm" resultType="com.thhy.staff.modules.biz.platuser.entity.PlatUserPullDown">

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java

@@ -25,7 +25,7 @@
    private String nameOfOrigin;//场地名称
    private String materialName;//物料名称

    private Integer incomingQuantity;//进厂数量
    private Double incomingQuantity;//进厂数量

    private Date createTime;//创建时间


 hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml

@@ -66,7 +66,7 @@
        #{materialName,jdbcType=VARCHAR},
      </if>
      <if test="incomingQuantity != null">
        #{incomingQuantity,jdbcType=INTEGER},
        #{incomingQuantity,jdbcType=DOUBLE},
      </if>
      <if test="status != null">
        #{status,jdbcType=INTEGER},
@@ -111,7 +111,7 @@
        material_name = #{materialName,jdbcType=VARCHAR},
      </if>
      <if test="incomingQuantity != null">
        incoming_quantity = #{incomingQuantity,jdbcType=INTEGER},
        incoming_quantity = #{incomingQuantity,jdbcType=DOUBLE},
      </if>
      <if test="status != null">
        `status` = #{status,jdbcType=INTEGER},

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/hiddenDanger/service/impl/HiddenDangerServiceImpl.java

@@ -171,7 +171,6 @@
    public BasicResult examine(HiddenDangerEntity hiddenDangerEntity) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String platUserId = regionInspectionRecordMapper.selectPlatUserId(hiddenDangerEntity.getCreateUser());

        Map platUser = regionInspectionRecordMapper.getPlatUser(platUserId);
        int user_type = (int) platUser.get("user_type");
        Map account = new HashMap();

 hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/integralAccount/entity/IntegralDetailEntity.java

@@ -32,8 +32,9 @@
    private Double changeIntegral;//变量在积分超市 修改前的变量


    @Excel(sort = 1,title = "时间")
    private Date createTime;
    @Excel(sort = 1,title = "时间")
    private String createDate;
    @Excel(sort = 2,title = "人员类别")
    private String userTypeName;
    @Excel(sort = 3,title = "人员姓名")

 hd/pipe/secure/src/main/resources/mapping/IntegralDetailMapper.xml

@@ -236,7 +236,8 @@
      SELECT
        t.*,
        spu.real_name realName,
        spu.user_type userTypeName
        spu.user_type userTypeName,
        DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate
      FROM t_integral_detail t
      LEFT JOIN sys_plat_user spu on spu.user_id = t.userId
      WHERE t.isUse = 1 and t.type = 2  and t.companyId = #{companyId}
@@ -280,7 +281,7 @@
  <select id="selectSafeIntegralInfo" resultType="com.thhy.secure.modules.biz.integralAccount.entity.IntegralDetailDto">
    SELECT
            t.*,
            DATE_FORMAT(t.createTime, '%Y-%m-%d') createDate
            DATE_FORMAT(t.createTime, '%Y-%m-%d %H:%m:%s') createDate
    FROM t_integral_detail t
    WHERE t.isUse = 1
    <if test="companyId != null and companyId !=''">