6

jinlin

2023-12-05 7416356c7658db835e3e47dbb93f49b7e0cd762b

6

 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/ConfigItemWarehouse.java

@@ -26,8 +26,7 @@
    @ApiModelProperty(value = "项目ID")
    private Long projectId;

    @ApiModelProperty(value = "检查单ID")
    private Long checkId;


    @ApiModelProperty(value = "配置项入库编号")
    private String code;

 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/model/WarehouseConfigItem.java

@@ -26,9 +26,15 @@
    @ApiModelProperty(value = "入库ID")
    private Long warehouseId;

    @ApiModelProperty(value = "检查单ID")
    private Long checkId;

    @ApiModelProperty(value = "序号")
    private Integer no;

    @ApiModelProperty(value = "入库状态")
    private Integer status;

    @ApiModelProperty(value = "配置项名称")
    private String itemName;


 modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/controller/TestCheckOrderController.java

@@ -56,16 +56,16 @@
        @ApiImplicitParam(name = Constant.Q.LIMIT, value = Constant.QV.LIMIT, required = true, dataType = Constant.QT.INT),
        @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
        @ApiImplicitParam(name = "code", value = "编号", dataType = Constant.QT.STRING, format = "code^LK"),        @ApiImplicitParam(name = "softwareidentity", value = "项目标识", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"),        @ApiImplicitParam(name = "softwarename", value = "项目名称", dataType = Constant.QT.STRING, format = "softwareName^LK")    })
            @ApiImplicitParam(name = "code", value = "编号", dataType = Constant.QT.STRING, format = "code^LK"),
            @ApiImplicitParam(name = "softwareidentity", value = "项目标识", dataType = Constant.QT.STRING, format = "softwareIdentity^LK"), @ApiImplicitParam(name = "softwarename", value = "项目名称", dataType = Constant.QT.STRING, format = "softwareName^LK")})
    public PageResult<TestCheckOrder> page(@ApiIgnore @QueryParam QueryFilter queryFilter){

        return PageResult.ok(testCheckOrderService.page(queryFilter));
    }

    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<CheckOrderDto> getDto(Long checkId, Long projectId,String itemType) {
        CheckOrderDto data = testCheckOrderService.getDto(checkId, projectId,itemType);
    public Result<CheckOrderDto> getDto(Long checkId, Long projectId, String pageCode) {
        CheckOrderDto data = testCheckOrderService.getDto(checkId, projectId, pageCode);
        return Result.ok(data);
    }

@@ -76,7 +76,8 @@
        //效验数据
        ValidatorUtils.validateEntity(checkOrderDto, AddGroup.class, DefaultGroup.class);
        Map<String, String> map = new HashMap<>();
        map.put("funCode", "test_check_order");
        String pagecode = checkOrderDto.getPageCode();
        map.put("funCode", "test_check_order"+pagecode);
        map.put("projectId",checkOrderDto.getProjectId().toString());
        checkOrderDto.getCheckOrder().setCode(sysCodeRuleService.getNewCode(map));
        Boolean result = testCheckOrderService.save(checkOrderDto);

 modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dao/TestCheckOrderListDao.java

@@ -20,5 +20,5 @@

    List<TestCheckOrderList> getList(Map<String, Object> params);

    List<TestCheckOrderList> itemList(String dictType);
    List<TestCheckOrderList> itemList(String pageCode);
}

 modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/dto/CheckOrderDto.java

@@ -18,7 +18,7 @@
    private Long checkId;//检查单ID
    private Long configOrderId;//入库单ID
    private Long configItemId;//配置项ID
    private String configItemType;//配置项类型
    private String pageCode;//配置项类型


    @ApiModelProperty(value = "测试项目基本信息")

 modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderListService.java

@@ -46,7 +46,7 @@
        return baseDao.getList(params);
    }

    public List<TestCheckOrderList> itemList(String dictType) {
        return baseDao.itemList(dictType);
    public List<TestCheckOrderList> itemList(String pageCode) {
        return baseDao.itemList(pageCode);
    }
}

 modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java

@@ -65,8 +65,9 @@
    }


    public CheckOrderDto getDto(Long checkId, Long projectId,String itemType) {
    public CheckOrderDto getDto(Long checkId, Long projectId,String pageCode) {
        CheckOrderDto data = new CheckOrderDto();
        data.setPageCode(pageCode);
        if (checkId != null) {
            data.setId(checkId);
            TestCheckOrder checkOrder = this.get(checkId);
@@ -81,16 +82,7 @@
        } else {
            TestCheckOrder checkOrder = new TestCheckOrder();
            data.setCheckOrder(checkOrder);
            List<TestCheckOrderList> checkOrderList =new ArrayList();
            if (itemType.equals("plan")){
                checkOrderList = checkOrderListService.itemList("plan_check_item");
            }else if (itemType.equals("explain")){
                checkOrderList = checkOrderListService.itemList("explain_check_item");
            }else if(itemType.equals("record")){
                checkOrderList = checkOrderListService.itemList("record_check_item");
            }else if (itemType.equals("report")){
                checkOrderList = checkOrderListService.itemList("report_check_item");
            }
            List<TestCheckOrderList> checkOrderList = checkOrderListService.itemList(pageCode+"_check_item");
            data.setCheckOrderList(checkOrderList);
        }
        if (projectId != null) {

 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseCmAuditDao.xml

@@ -5,7 +5,7 @@

    <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit">
        select a.*
        from warehouse_cm_audit a
        from config_item_warehouse_cm a
        <where>
            a.is_delete = 0
            <if test="warehouseId!=null">

 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseConfigItemDao.xml

@@ -5,7 +5,7 @@

    <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
        select a.*
        from warehouse_config_item a
        from config_item_warehouse_detail a
        <where>
            a.is_delete = 0
            <if test="warehouseId!=null">

 modules/mainPart/src/main/resources/mapper/configItemWarehouse/WarehouseQaAuditDao.xml

@@ -5,7 +5,7 @@

    <select id="getList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit">
        select a.*
        from warehouse_qa_audit a
        from config_item_warehouse_qa a
        <where>
            a.is_delete = 0
            <if test="warehouseId!=null">

 modules/mainPart/src/main/resources/mapper/testCheckOrder/TestCheckOrderListDao.xml

@@ -25,7 +25,7 @@
        <where>
            dd.IS_DELETE = 0
            <if test="dictType != null and dictType != ''">
                and dt.DICT_TYPE = #{dictType}
                and dt.DICT_TYPE = #{pageCode}
            </if>
        </where>
        ORDER BY dd.sort

 web/src/views/layout/main-sidebar-sub-menu.vue

@@ -70,7 +70,8 @@
          }
          console.log(route.meta.params, 'params: route.meta.params')
          this.$nextTick(() => {
            this.$router.push({name: route.name, params: route.meta.params})
            console.log(route.meta.params,"route.meta.params")
            this.$router.push({name: route.name, query: route.meta.params, params: route.meta.params})
          })
        }
      }

 web/src/views/modules/testCheckOrder/TestCheckOrder-AddOrUpdate.vue

@@ -10,16 +10,16 @@
      <div style="border: 1px solid rgba(0,0,0,.2);width: 99%">
        <div style="border-bottom: 1px solid rgba(0,0,0,.2);" class="testCheckContentWidth">
          <el-form-item class="marginTopAndMarginBottom" label="项目标识" style="width: 49%">
            <el-input v-model="dataForm.project.softwareName" placeholder="项目标识"></el-input>
            <el-input v-model="dataForm.project.softwareIdentity" placeholder="项目标识"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom" label="项目名称" style="width: 49%">
            <el-input v-model="dataForm.project.softwareIdentity" placeholder="项目名称"></el-input>
            <el-input v-model="dataForm.project.softwareName" placeholder="项目名称"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="检查人" style="width: 49%">
            <el-input v-model="dataForm.project.softwareIdentity" placeholder="检查人"></el-input>
            <el-input v-model="dataForm.testCheckOrder.examiner" placeholder="检查人"></el-input>
          </el-form-item>
          <el-form-item class="marginTopAndMarginBottom3" label="检查时间" style="width: 49%">
            <el-input v-model="dataForm.project.isContract" placeholder="检查时间"></el-input>
            <el-input v-model="dataForm.testCheckOrder.examDate" placeholder="检查时间"></el-input>
          </el-form-item>
        </div>
        <div style="border-bottom: 1px solid rgba(0,0,0,.2);">
@@ -27,21 +27,21 @@
            <div style="padding: 5px">测试计划：</div>
            <div class="table-container">
              <el-table ref="tableCirculatOrderList" class="el-software el-margin-top-bot" border
                        :data="dataForm.technicalList"
                        :data="dataForm.checkOrderList"
                        stripe>
                <el-table-column prop="no" align="center" width="60" label="序号">
                  <template slot-scope="scope">
                    <span v-html="indexFormat(scope.$index)"></span>
                  </template>
                </el-table-column>
                <el-table-column prop="infoName" min-width="180" label="主要检查内容">
                <el-table-column prop="checkContent" min-width="180" label="主要检查内容">
                  <template v-slot="{ row }">
                    <el-input v-model="row.name" placeholder="主要检查内容"></el-input>
                    <el-input v-model="row.checkContent" placeholder="主要检查内容"></el-input>
                  </template>
                </el-table-column>
                <el-table-column prop="identify" align="center" width="150" label="检查结果">
                <el-table-column prop="checkResult" align="center" width="150" label="检查结果">
                  <template v-slot="{ row }">
                    <zt-dict v-model="row.identify" dict="is_or_not" :radio="true"></zt-dict>
                    <zt-dict v-model="row.checkResult" dict="is_or_not" :radio="true"></zt-dict>
                  </template>
                </el-table-column>
                <el-table-column prop="remark" label="备注" width="100" align="center">
@@ -71,7 +71,7 @@
          <div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <el-input type="textarea"
                        :rows="3" v-model="dataForm.testCheckOrder.itemOther" placeholder="问题描述..."></el-input>
                        :rows="3" v-model="dataForm.testCheckOrder.problemDescription" placeholder="问题描述..."></el-input>
            </el-form-item>
          </div>
        </div>
@@ -82,7 +82,7 @@
          <div class="el-border-left acceptDate" style="height: 80px;width: 80%;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <el-input type="textarea"
                        :rows="3" v-model="dataForm.testCheckOrder.itemOther" placeholder="问题处理..."></el-input>
                        :rows="3" v-model="dataForm.testCheckOrder.problemProcess" placeholder="问题处理..."></el-input>
            </el-form-item>
          </div>
        </div>
@@ -92,7 +92,7 @@
          </div>
          <div class="el-border-left-right acceptDate1" style="width: 40%;height: 40px;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <el-input v-model="dataForm.testCheckOrder.itemOther" placeholder="处理人"></el-input>
              <el-input v-model="dataForm.testCheckOrder.processor" placeholder="处理人"></el-input>
            </el-form-item>
          </div>
          <div style="width: 84px;text-align: center;font-weight: 600">
@@ -100,7 +100,7 @@
          </div>
          <div class="el-border-left acceptDate1" style="width: 40%;height: 40px;">
            <el-form-item  label-width="150px" style="width: 100%;padding-left:20px;margin-bottom:0">
              <el-input v-model="dataForm.testCheckOrder.itemOther" placeholder="验证人"></el-input>
              <el-input v-model="dataForm.testCheckOrder.verifier" placeholder="验证人"></el-input>
            </el-form-item>
          </div>
        </div>
@@ -128,8 +128,6 @@
          project:{
            softwareIdentity:'',
            softwareName:'',
            softwareType:'',
            isContract:'',
          },
          testCheckOrder:{
            code: '',
@@ -138,16 +136,9 @@
            problemDescription: '',
            problemProcess: '',
            processor: '',
            processorId: '',
            processDate: '',
            verifier: '',
            verifierId: '',
            verifyDate: '',
            year: ''
          },
          testAgencyInfo:{
            agencyName:''
          }
          checkOrderList:{}
        }
      }
    },
@@ -169,7 +160,12 @@
      },
      // 获取信息
      async getInfo() {
        let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/${this.dataForm.id}`)
        let params = {
          checkId: this.dataForm.id,
          projectId: this.dataForm.projectId,
          pageCode:this.pageCode
        }
        let res = await this.$http.get(`/testCheckOrder/TestCheckOrder/getDto`, {params: params})
        this.dataForm = {
          ...this.dataForm,
          ...res.data

 web/src/views/modules/testCheckOrder/TestCheckOrder.vue

@@ -40,17 +40,10 @@
  import Preview from '@/views/pages/view'
  export default {
    props: {
      pageCode: {
        type: String,
        default: ''
      },
      pageRead: {
        type: String,
        default: 'yes'
      }
    },
    data() {
      return {
        pageCode : '',
        dataForm: {
          code: '',
          softwareidentity: '',
@@ -58,6 +51,9 @@
        }
      }
    },
    mounted() {
      this.pageCode = this.$route.query.pageCode
    },
    components: {
      AddOrUpdate,
      ProjectSelect,

 web/src/views/modules/testCheckOrder/TestExplainCheckOrder.vue

File was deleted

 web/src/views/modules/testCheckOrder/TestPlanCheckOrder.vue

File was deleted

 web/src/views/modules/testCheckOrder/TestRecordCheckOrder.vue

File was deleted

 web/src/views/modules/testCheckOrder/TestReportCheckOrder.vue

File was deleted