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

叶松

2023-10-26 979c7c817b2e7d2430ac447b10f943c12dac3b64

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

 hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/controller/MoldQualityController.java

对比新文件
@@ -0,0 +1,86 @@
package com.thhy.engineering.modules.biz.moldquality.controller;

import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityEntity;
import com.thhy.engineering.modules.biz.moldquality.service.MoldQualityService;
import com.thhy.general.common.BasicResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-25 14:57:04
 * 模具质量检测控制层
 */
@RestController
@RequestMapping(value = "moldQuality")
public class MoldQualityController {

    @Autowired
    private MoldQualityService moldQualityService;

    @PostMapping(value = "insert")
    BasicResult insert(@RequestBody MoldQualityEntity moldQualityEntity){
        return moldQualityService.insert(moldQualityEntity);
    }

    @GetMapping(value = "delete")
    BasicResult delete(Integer id){
        return moldQualityService.delete(id);
    }

    @PostMapping(value = "update")
    BasicResult update(@RequestBody MoldQualityEntity moldQualityEntity){
        return moldQualityService.update(moldQualityEntity);
    }

    /**
     * 查询列表
     * @param map
     * @return
     */
    @PostMapping(value = "findAll")
    BasicResult findAll(@RequestBody Map<String,Object> map){
        return moldQualityService.findAll(map);
    }

    /**
     * 根据id查询一条
     * @param id
     * @return
     */
    @GetMapping(value = "findOneById")
    BasicResult findOneById(Integer id){
        return moldQualityService.findOneById(id);
    }


    /**
     * 获取模具编号列表
     * @return
     */
    @GetMapping(value = "getMoldNum")
    BasicResult getMoldNum(String proId){
        return moldQualityService.getMoldNum(proId);
    }

    /**
     * 获取模具型号列表
     * @return
     */
    @GetMapping(value = "getMoldCode")
    BasicResult getMoldCode(String proId){
        return moldQualityService.getMoldCode(proId);
    }

    /**
     * 获取1条模具
     * @return
     */
    @PostMapping(value = "getMoldByProIdAndModNumAndModCode")
    BasicResult getMoldByProIdAndModNumAndModCode(@RequestBody Map<String,Object> map){
        return moldQualityService.getMoldByProIdAndModNumAndModCode(map);
    }

}

 hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityEntity.java

对比新文件
@@ -0,0 +1,79 @@
package com.thhy.engineering.modules.biz.moldquality.entity;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-25 14:58:20
 * 模具质量检测实体
 */
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class MoldQualityEntity implements Serializable {

    private Integer id;

    /**
     *  模具型号
     */
    private String    mouldCode;

    /**
     *  模具编号
     */
    private String    mouldNum;

    /**
     *  块号
     */
    private String    blockNum;

    /**
     *  尺寸
     */
    private String    size;

    /**
     *  转向
     */
    private String    turn;

    /**
     *  注浆孔
     */
    private String    groutingHole;

    /**
     *  检测内容
     */
    private String    content;

    /**
     *  上传监测表
     */
    private List<MoldQualityFileEntity> moldQualityFileEntities;

    /**
     *  检查表日期
     */
    private Date    checkDate;

    /**
     *  检测单位
     */
    private String    checkUnit;
    private Date    createDate;
    private String    createUser;
    private String companyId;
    private String proId;
    private String proName;
}

 hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/entity/MoldQualityFileEntity.java

对比新文件
@@ -0,0 +1,28 @@
package com.thhy.engineering.modules.biz.moldquality.entity;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;
import java.util.Date;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-26 8:53:53
 * 模具质量检测文件表
 */
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class MoldQualityFileEntity implements Serializable {

    private Integer id;
    private Integer    moldQualityId;
    private String fileName;
    private String fileUrl;
    private Date createTime;

}

 hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityFileMapper.java

对比新文件
@@ -0,0 +1,22 @@
package com.thhy.engineering.modules.biz.moldquality.mapper;

import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityFileEntity;
import org.apache.ibatis.annotations.Mapper;
import org.bouncycastle.voms.VOMSAttribute;

import java.util.List;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-26 8:59:05
 * 模具质量检测文件表mapper
 */
@Mapper
public interface MoldQualityFileMapper {

    void insertList(List<MoldQualityFileEntity> list);

    void delete(Integer moldQualityId);

    List<MoldQualityFileEntity> findFileList(Integer moldQualityId);
}

 hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/mapper/MoldQualityMapper.java

对比新文件
@@ -0,0 +1,35 @@
package com.thhy.engineering.modules.biz.moldquality.mapper;

import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityEntity;
import com.thhy.general.common.BasicResult;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;
import java.util.Map;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-25 15:03:34
 * 模具质量检测mapper
 */
@Mapper
public interface MoldQualityMapper {

    void insert(MoldQualityEntity moldQualityEntity);
    MoldQualityEntity findNewOne();

    void delete(Integer id);

    void update(MoldQualityEntity moldQualityEntity);

    List<MoldQualityEntity> findAll(Map<String,Object> map);

    MoldQualityEntity findOneById(Integer id);


    List<Map> getMoldNum(String proId);

    List<Map> getMoldCode(String proId);

    Map getMoldByProIdAndModNumAndModCode(Map<String,Object> map);
}

 hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/MoldQualityService.java

对比新文件
@@ -0,0 +1,46 @@
package com.thhy.engineering.modules.biz.moldquality.service;

import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityEntity;
import com.thhy.general.common.BasicResult;

import java.util.Map;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-25 15:06:07
 * 模具检测逻辑层
 */
public interface MoldQualityService {


    BasicResult insert(MoldQualityEntity moldQualityEntity);

    BasicResult delete(Integer id);

    BasicResult update(MoldQualityEntity moldQualityEntity);

    BasicResult findAll(Map<String,Object> map);

    BasicResult findOneById(Integer id);

    /**
     * 获取模具编号列表
     * @return
     */
    BasicResult getMoldNum(String proId);


    /**
     * 获取模具型号列表
     * @return
     */
    BasicResult getMoldCode(String proId);


    /**
     * 获取1条模具
     * @return
     */
    BasicResult getMoldByProIdAndModNumAndModCode(Map<String,Object> map);

}

 hd/pipe/engineeringManage/src/main/java/com/thhy/engineering/modules/biz/moldquality/service/impl/MoldQualityServiceImpl.java

对比新文件
@@ -0,0 +1,104 @@
package com.thhy.engineering.modules.biz.moldquality.service.impl;

import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityEntity;
import com.thhy.engineering.modules.biz.moldquality.entity.MoldQualityFileEntity;
import com.thhy.engineering.modules.biz.moldquality.mapper.MoldQualityFileMapper;
import com.thhy.engineering.modules.biz.moldquality.mapper.MoldQualityMapper;
import com.thhy.engineering.modules.biz.moldquality.service.MoldQualityService;
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
import com.thhy.general.utils.UserInfoUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;

/**
 * @Author QiuYuHao
 * @CreateDate 2023-10-25 15:06:40
 * 磨具监测实现层
 */

@Service
public class MoldQualityServiceImpl implements MoldQualityService {

    @Autowired
    private MoldQualityMapper mapper;

    @Autowired
    private MoldQualityFileMapper moldQualityFileMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public BasicResult insert(MoldQualityEntity moldQualityEntity) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String companyId = sysUserInfo.getCompanyId();
        moldQualityEntity.setCompanyId(companyId);
        mapper.insert(moldQualityEntity);
        MoldQualityEntity newOne = mapper.findNewOne();
        moldQualityEntity.getMoldQualityFileEntities().forEach(modFile->{
            modFile.setMoldQualityId(newOne.getId());
        });
        moldQualityFileMapper.insertList(moldQualityEntity.getMoldQualityFileEntities());
        return BasicResult.success();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public BasicResult delete(Integer id) {
        mapper.delete(id);
        moldQualityFileMapper.delete(id);
        return BasicResult.success();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public BasicResult update(MoldQualityEntity moldQualityEntity) {
        mapper.update(moldQualityEntity);
        moldQualityFileMapper.delete(moldQualityEntity.getId());
        List<MoldQualityFileEntity> moldQualityFileEntities = moldQualityEntity.getMoldQualityFileEntities();
        moldQualityFileEntities.forEach(moldFile->{
            moldFile.setId(moldQualityEntity.getId());
        });
        moldQualityFileMapper.insertList(moldQualityFileEntities);
        return BasicResult.success();
    }

    @Override
    public BasicResult findAll(Map<String, Object> map) {
        SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
        String companyId = sysUserInfo.getCompanyId();
        map.put("companyId",companyId);
        PageHelper.startPage((int)map.get("pageNum"),(int)map.get("pageSize"));
        List<MoldQualityEntity> all = mapper.findAll(map);
        PageInfo<MoldQualityEntity> moldQualityEntities = new PageInfo<>(all);
        return BasicResult.success(moldQualityEntities);
    }

    @Override
    public BasicResult findOneById(Integer id) {
        MoldQualityEntity oneById = mapper.findOneById(id);
        oneById.setMoldQualityFileEntities(moldQualityFileMapper.findFileList(oneById.getId()));
        return BasicResult.success(oneById);
    }

    @Override
    public BasicResult getMoldNum(String proId) {
        return BasicResult.success(mapper.getMoldNum(proId));
    }

    @Override
    public BasicResult getMoldCode(String proId) {
        return BasicResult.success(mapper.getMoldCode(proId));
    }

    @Override
    public BasicResult getMoldByProIdAndModNumAndModCode(Map<String, Object> map) {
        return BasicResult.success(mapper.getMoldByProIdAndModNumAndModCode(map));
    }
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/embedment/entity/SysEmbedmentGoodsEntity.java

@@ -30,6 +30,7 @@
    /**
     * 预埋件类型  字典
     */
    @Excel(sort = 3,title = "类型")
    private String embedmentType;
    private String dictName;

@@ -42,23 +43,25 @@
    /**
     * 计量单位
     */
    @Excel(sort = 3,title = "计量单位")
    @Excel(sort = 4,title = "计量单位")
    private String unit;

    /**
     * 库存数量
     */
    @Excel(sort = 5,title = "库存数量")
    private Integer stock;

    /**
     * 位置
     */
    @Excel(sort = 4,title = "位置")
    @Excel(sort = 7,title = "位置")
    private String position;

    /**
     * 报警数量
     */
    @Excel(sort = 6,title = "报警数")
    private Integer alarmCount;

    /**

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

对比新文件
@@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.thhy.secure.modules.biz.pipereport.mapper.PipeReportMapper">


   <select id="getPipeReportList" resultType="com.thhy.secure.modules.biz.pipereport.entity.PipeReportEntity">

       SELECT
               c.pro_id proId,
               c.pro_name proName,
               IFNULL(c.produceTotal,0) produceTotal,
               IFNULL(d.qualifiedTotal,0) qualifiedTotal,
               IFNULL(e.shippingNum,0) shippingNum
       FROM      (
                         SELECT
                             COUNT(a.pro_id) produceTotal,
                             b.pro_id,
                             b.pro_name
                         FROM  sys_project b
                         LEFT JOIN t_pipe_info a on b.pro_id = a.pro_id
                         WHERE b.is_use =1 and b.company_id = #{companyId}
                         GROUP BY b.pro_id
                         ) c
                         LEFT JOIN
                         (
                                 SELECT
                                         COUNT(a.pro_id) qualifiedTotal,
                                         a.pro_id,
                                         b.pro_name
                                 FROM t_pipe_info a
                                              LEFT JOIN sys_project b on b.pro_id = a.pro_id
                                 WHERE a.check_result = 1 and b.company_id = #{companyId}
                                 GROUP BY a.pro_id
                                 ) d ON d.pro_id = c.pro_id
                         LEFT JOIN
                         (
                                 SELECT
                                         COUNT(a.pro_id) shippingNum,
                                         a.pro_id,
                                         b.pro_name
                                 FROM t_pipe_out a
                                              LEFT JOIN sys_project b on b.pro_id = a.pro_id
                                 WHERE b.company_id = #{companyId}
                                 GROUP BY a.pro_id
                                 ) e on e.pro_id = c.pro_id

   </select>

    <select id="getSteelReportList" resultType="com.thhy.secure.modules.biz.pipereport.entity.PipeReportEntity">
                SELECT
                        c.pro_id proId,
                        c.pro_name proName,
                        IFNULL(c.produceTotal,0) produceTotal,
                        IFNULL(d.qualifiedTotal,0) qualifiedTotal,
                        IFNULL(e.moldedNotNum,0) moldedNotNum,
                        IFNULL(f.moldedNum,0) moldedNum
                FROM(
                            SELECT
                                    COUNT(a.pro_id) produceTotal,
                                    b.pro_id,
                                    b.pro_name
                            FROM sys_project b
                                         LEFT JOIN t_steel_produce a on b.pro_id = a.pro_id
                            WHERE b.is_use =1 and b.company_id = #{companyId}
                            GROUP BY b.pro_id

                            ) c
                            LEFT JOIN
                            (
                                    SELECT
                                            COUNT(a.pro_id) qualifiedTotal,
                                            a.pro_id,
                                            b.pro_name
                                    FROM t_steel_produce a
                                                 LEFT JOIN sys_project b on b.pro_id = a.pro_id
                                    WHERE a.is_qualified = 1 and a.is_use = 1  and b.company_id = #{companyId}
                                    GROUP BY a.pro_id
                                    ) d ON d.pro_id = c.pro_id
                            LEFT JOIN
                            (
                                    SELECT
                                            COUNT(a.pro_id) moldedNotNum,
                                            a.pro_id,
                                            b.pro_name
                                    FROM t_steel_produce a
                                                 LEFT JOIN sys_project b on b.pro_id = a.pro_id
                                    WHERE a.is_model = 2 and a.is_use = 1  and b.company_id = #{companyId}
                                    GROUP BY a.pro_id
                                    ) e on e.pro_id = c.pro_id
                            LEFT JOIN
                            (
                                    SELECT
                                            COUNT(a.pro_id) moldedNum,
                                            a.pro_id,
                                            b.pro_name
                                    FROM t_steel_produce a
                                                 LEFT JOIN sys_project b on b.pro_id = a.pro_id
                                    WHERE a.is_model = 1 and a.is_use = 1  and b.company_id = #{companyId}
                                    GROUP BY a.pro_id
                                    ) f on f.pro_id = c.pro_id
    </select>

</mapper>

 web/src/components/element/Pagination.vue

@@ -54,6 +54,10 @@
};
</script>
<style lang="scss" scoped>
.el-pagination {

  text-align: right;

}



// 主体底部样式
::v-deep.el-pagination .btn-prev,
::v-deep.el-pagination .btn-next,
@@ -73,6 +77,6 @@
}

.pagination-container {
  margin-top: 30px;
  margin: 30px 0;

}
</style>

 web/src/components/element/Table.vue

@@ -142,9 +142,12 @@
<style lang="scss" scoped>

.box {

  height: 100%;

  display: flex;

  flex-direction: column;

}



.el-table {

  overflow: auto;

  border: none;

  height: 100%;

}


 web/src/views/GoodManage/components/AuxiliaryInvent.vue

@@ -73,7 +73,7 @@
          <el-input v-model="ruleForm.correctionBefore" :size="size" clearable placeholder="请输入库存数量" :disabled="disabled"></el-input>
        </el-form-item>
        <el-form-item label="校正数量：" prop="correctionNum" v-if="!asyncTitle">
          <el-input v-model="ruleForm.correctionNum" type="number" :size="size" clearable placeholder="请输入校正数量" @blur="changeAfter"></el-input>
          <el-input v-model="ruleForm.correctionNum" type="number" :size="size" clearable placeholder="请输入校正数量" @input="changeAfter"></el-input>

        </el-form-item>
        <el-form-item label="校正后数量：" prop="correctionAfter" v-if="!asyncTitle">
          <el-input v-model="ruleForm.correctionAfter" :size="size" clearable placeholder="请输入校正后数量" :disabled="true"></el-input>

 web/src/views/MaterialsIndex/components/embedded/Invent.vue

@@ -52,7 +52,7 @@
    <el-dialog class="prop_dialog" :title="asyncTitle ? '预警设置' : '库存校正'" :close-on-click-modal="false"
      :visible.sync="asyncVisible" width="35%">
      <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="auto" class="rule_form">
        <el-form-item label="物品名称：" prop="embedmentName">
        <el-form-item label="预埋件名称：" prop="embedmentName">

          <el-input v-model="ruleForm.embedmentName" :size="size" clearable placeholder="请输入物品名称"
            :disabled="disabled"></el-input>
        </el-form-item>
@@ -66,7 +66,7 @@
        </el-form-item>
        <el-form-item label="校正数量：" prop="correctionNum" v-if="!asyncTitle">
          <el-input v-model="ruleForm.correctionNum" type="number" :size="size" clearable placeholder="请输入校正数量"
            @blur="changeAfter"></el-input>
            @input="changeAfter"></el-input>

        </el-form-item>
        <el-form-item label="校正后数量：" prop="correctionAfter" v-if="!asyncTitle">
          <el-input v-model="ruleForm.correctionAfter" :size="size" clearable placeholder="请输入校正后数量"

 web/src/views/ProjectManage/ProjectsIndex.vue

@@ -31,7 +31,7 @@
            <div>{{ showInfo(row.proHas) }}</div>
          </template>
        </el-table-column>
        <el-table-column label="转向" align="center" show-overflow-tooltip>
        <el-table-column label="转向" align="center" width="130">

          <template #default="{ row }">
            <div>{{ showInfo(row.proTurns) }}</div>
          </template>

 web/src/views/ProjectManage/SectionManage.vue

@@ -254,7 +254,7 @@
      return this.submitMode === 'update'

    },

    dialogTitle() {

      return this.isUpdate ? '修改新增单位工程' : '新增单位工程'

      return this.isUpdate ? '修改单位工程' : '新增单位工程'

    },

  },

  created() {


 web/src/views/SecureManage/RiskGrad/AreaGuarantee.vue

@@ -193,24 +193,24 @@
                },
                {
                    name: "包保领导", key: "leaderList", formatter: (row) => {
                        let el = ''
                        let el = []

                        row.leaderList.forEach(item => {
                            el += item.realName + '、'
                            el.push(item.realName)

                        })
                        return el
                        return el.join('、')

                    }
                },
                {
                    name: "小组成员", key: "staffList", formatter: (row) => {
                        let el = ''
                        let el = []

                        row.staffList.forEach(item => {
                            el += item.realName + '、'
                            el.push(item.realName)

                        })
                        return el
                        return el.join('、')

                    }
                },
                {name: "风险源情况", key: "riskSourceSituation"},
                {name: "应对措施", key: "countermeasures"},
                {name: "风险源情况", key: "riskSourceSituation", showOverflowTip: true},

                {name: "应对措施", key: "countermeasures", showOverflowTip: true},

                {
                    operation: true, name: "操作", width: 140, value: [
                        {name: "修改", class: "table_btn", permission: "update", handleRow: this.updateRow},

 web/src/views/SecureManage/RiskGrad/DangerInform.vue

@@ -242,27 +242,19 @@
  
<style lang="scss" scoped>
@import '@/style/layout-main.scss';

/deep/ {
    &::-webkit-scrollbar {
        width: 8px;
        height: 8px;
</style>

<style lang="scss">

.el-color-dropdown__btns {

    .el-color-dropdown__btn {

        background: #fff;

        border: 1px solid #dcdfe6;

        color: #606266;

    }

    &::-webkit-scrollbar-corner {
    .el-color-dropdown__link-btn {

        border-color: transparent;

        background-color: transparent;
    }

    &::-webkit-scrollbar-thumb {
        border-radius: 10px;
        box-shadow: inset 0 0 5px transparent;
        background: #39B5FE;
    }

    &::-webkit-scrollbar-track {
        box-shadow: inset 0 0 5px transparent;
        border-radius: 10px;
        background: rgba(76, 188, 254, .3);
        color: #66b1ff;

    }
}
</style>