修改

jinlin

2023-12-08 9b6941de040578b48bb675727437463f8ad63673

修改

 modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/model/ConfigItemChange.java

@@ -50,6 +50,9 @@
    @ApiModelProperty(value = "变更实施人")
    private String implementer;

    @ApiModelProperty(value = "变更实施人ID")
    private Long implementerId;

    @ApiModelProperty(value = "变更日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date changeDate;
@@ -61,7 +64,7 @@
    private String qaAuditor;

    @ApiModelProperty(value = "QA审核人ID")
    private String qaAuditorId;
    private Long qaAuditorId;

    @ApiModelProperty(value = "QA审核日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
@@ -74,7 +77,7 @@
    private String cmAuditor;

    @ApiModelProperty(value = "CM审核人ID")
    private String cmAuditorId;
    private Long cmAuditorId;

    @ApiModelProperty(value = "CM审核日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
@@ -97,7 +100,7 @@
    private String outboundOperator;

    @ApiModelProperty(value = "出库操作人ID")
    private String outboundOperatorId;
    private Long outboundOperatorId;

    @ApiModelProperty(value = "出库操作日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
@@ -110,7 +113,7 @@
    private String warehouseOperator;

    @ApiModelProperty(value = "入库操作人ID")
    private String warehouseOperatorId;
    private Long warehouseOperatorId;

    @ApiModelProperty(value = "入库操作日期")
    @JsonFormat(pattern = "yyyy-MM-dd")

 modules/mainPart/src/main/java/com/zt/life/modules/configItemChange/service/ConfigItemChangeService.java

@@ -87,7 +87,7 @@
            baseDao.updateById(configItemDto.getConfigItemChange());
        else {
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "config_item_Change");
            map.put("funCode", "config_item_change");
            map.put("projectId", configItemDto.getProjectId().toString());
            configItemDto.getConfigItemChange().setProjectId(configItemDto.getProjectId());
            configItemDto.getConfigItemChange().setCode(sysCodeRuleService.getNewCode(map));
@@ -181,13 +181,13 @@
        } else {
            ConfigItemChange configItemChange = new ConfigItemChange();
            data.setConfigItemChange(configItemChange);
            List<?> cmList = baseDao.itemList("warehouse_cm_audit");
            List<?> cmList = baseDao.itemList("change_cm_audit");
            List<?> CmAuditList = cmList;
            data.setCmAuditList((List<WarehouseCmAudit>) CmAuditList);
            List<?> qaList = baseDao.itemList("warehouse_qa_audit");
            List<?> qaList = baseDao.itemList("change_qa_audit");
            List<?> QaAuditList = qaList;
            data.setQaAuditList((List<WarehouseQaAudit>) QaAuditList);
            List<?> resultList = configItemService.ConfigItemList(projectId);
            List<?> resultList = configItemService.warehouseConfigList(projectId);
            List<?> ConfigItemList = resultList;
            data.setConfigItemList((List<WarehouseConfigItem>) ConfigItemList);
        }

 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/dao/WarehouseConfigItemDao.java

@@ -22,4 +22,6 @@
    List<WarehouseConfigItem> getList(Map<String, Object> params);

    List<WarehouseConfigItem> itemList(Long projectId);

    List<WarehouseConfigItem> warehouseList(Long projectId);
}

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

@@ -48,7 +48,7 @@
    private String qaAuditor;

    @ApiModelProperty(value = "QA审核人ID")
    private String qaAuditorId;
    private Long qaAuditorId;

    @ApiModelProperty(value = "QA审核日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
@@ -61,7 +61,7 @@
    private String cmAuditor;

    @ApiModelProperty(value = "CM审核人ID")
    private String cmAuditorId;
    private Long cmAuditorId;

    @ApiModelProperty(value = "CM审核日期")
    @JsonFormat(pattern = "yyyy-MM-dd")
@@ -84,7 +84,7 @@
    private String operator;

    @ApiModelProperty(value = "操作人ID")
    private String operatorId;
    private Long operatorId;

    @ApiModelProperty(value = "操作日期")
    @JsonFormat(pattern = "yyyy-MM-dd")

 modules/mainPart/src/main/java/com/zt/life/modules/configItemWarehouse/service/WarehouseConfigItemService.java

@@ -50,4 +50,8 @@
    public List<WarehouseConfigItem> ConfigItemList(Long projectId) {
        return baseDao.itemList(projectId);
    }

    public List<WarehouseConfigItem> warehouseConfigList(Long projectId) {
        return baseDao.warehouseList(projectId);
    }
}

 modules/mainPart/src/main/resources/mapper/configItemChange/ConfigItemChangeDao.xml

New file
@@ -0,0 +1,35 @@
<?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.zt.life.modules.configItemChange.dao.ConfigItemChangeDao">

    <select id="getList" resultType="com.zt.life.modules.configItemChange.model.ConfigItemChange">
        select a.* ,p.*,p.CODE AS projectCode
        from config_item_change a
        INNER JOIN  project p ON p.id = a.project_id
        <where>
            a.is_delete = 0 and p.is_delete = 0
            <if test="whereSql!=null">
                and ${whereSql}
            </if>
        </where>
        <if test="orderBySql!=null">
            ORDER BY ${orderBySql}
        </if>
    </select>
    <select id="itemList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit">
        SET @row_number = 0;
        SELECT  dd.dict_label AS examineItem,
        (@row_number := @row_number + 1) AS no
        FROM sys_dict_type dt
        JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
        <where>
            dd.IS_DELETE = 0
            <if test="dictType != null and dictType != ''">
                and dt.DICT_TYPE = #{dictType}
            </if>
        </where>
        ORDER BY dd.sort
    </select>

</mapper>

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

@@ -43,5 +43,12 @@
        WHERE i.is_delete = 0
          AND  i.project_id = ${projectId}
    </select>
    <select id="warehouseList" resultType="com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem">
        select a.*
        from config_item_warehouse_detail a
                 JOIN config_item_warehouse w ON w.project_id = ${projectId}
        WHERE a.is_delete = 0
          AND  w.id = a.warehouse_id
    </select>

</mapper>

 web/src/views/modules/configItemChange/ConfigItemChange-AddOrUpdate.vue

@@ -16,12 +16,12 @@
            <el-input v-model="dataForm.project.softwareName" placeholder="请输入项目名称"></el-input>
          </el-form-item>
          <el-form-item label="申请人" style="width: 49%">
            <el-input :disabled="stepMarker!=='pzxrk_first'" v-model="dataForm.configItemChange.applicant"
            <el-input :disabled="stepMarker!=='pzxbg_first'" v-model="dataForm.configItemChange.applicant"
                      placeholder="请输入申请人"></el-input>
          </el-form-item>
          <el-form-item label="申请日期" style="width: 49%">
            <el-date-picker
              :disabled="stepMarker!=='pzxrk_first'"
              :disabled="stepMarker!=='pzxbg_first'"
              v-model="dataForm.configItemChange.applyDate"
              type="date"
              placeholder="请选择申请日期">
@@ -106,7 +106,7 @@
          </div>
          <div class="el-border-left acceptDate" style="width: 90%;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <el-input v-model="dataForm.configItemChange.problemProcess" placeholder="变更原因..."></el-input>
              <el-input v-model="dataForm.configItemChange.changeReason" placeholder="变更原因..."></el-input>
            </el-form-item>
          </div>
        </div>
@@ -116,7 +116,7 @@
          </div>
          <div class="el-border-left acceptDate" style="width: 90%;">
            <el-form-item style="width: 100%;padding-left:20px;margin:0;">
              <el-input v-model="dataForm.configItemChange.problemProcess" placeholder="变更影响分析..."></el-input>
              <el-input v-model="dataForm.configItemChange.changeAnalysis" placeholder="变更影响分析..."></el-input>
            </el-form-item>
          </div>
        </div>
@@ -126,15 +126,15 @@
          </div>
          <div style="width: calc(100% - 120px)" class="el-border-left">
            <el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
              <el-input v-if="stepMarker=='pzxrk_cmcz'" type="textarea" :rows="2" placeholder="请输入内容"
                        v-model="dataForm.configItemChange.projectCmOperations"></el-input>
              <span v-else>{{dataForm.configItemChange.projectCmOperations}}</span>
              <el-input v-if="stepMarker=='pzxbg_cmcz'" type="textarea" :rows="2" placeholder="请输入内容"
                        v-model="dataForm.configItemChange.changeContent"></el-input>
              <span v-else>{{dataForm.configItemChange.changeContent}}</span>
            </el-form-item>
            <el-form-item label-width="80%" label="变更实施人：" style="width: 65%">
              <span>{{dataForm.configItemChange.operator}}</span>
              <span>{{dataForm.configItemChange.implementer}}</span>
            </el-form-item>
            <el-form-item label="日期：" style="width: 20%">
              <span>{{dataForm.configItemChange.operateDate}}</span>
              <span>{{dataForm.configItemChange.changeDate}}</span>
            </el-form-item>
          </div>
        </div>
@@ -144,7 +144,7 @@
          </div>
          <div style="width: calc(100% - 120px)" class="el-border-left">
            <el-form-item class="el-wt-form-item-margin" label-width="20px" style="width: 85%">
              <zt-dict :disabled="stepMarker!=='pzxrk_bmsh'" v-model="dataForm.configItemChange.approvalOpinions"
              <zt-dict :disabled="stepMarker!=='pzxbg_bmsh'" v-model="dataForm.configItemChange.approvalOpinions"
                       dict="is_pass" :radio="true"
                       clearable></zt-dict>
            </el-form-item>
@@ -162,15 +162,15 @@
          </div>
          <div style="width: calc(100% - 120px)" class="el-border-left">
            <el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
              <el-input v-if="stepMarker=='pzxrk_cmcz'" type="textarea" :rows="2" placeholder="请输入内容"
                        v-model="dataForm.configItemChange.projectCmOperations"></el-input>
              <span v-else>{{dataForm.configItemChange.projectCmOperations}}</span>
              <el-input v-if="stepMarker=='pzxbg_cmcz'" type="textarea" :rows="2" placeholder="请输入内容"
                        v-model="dataForm.configItemChange.outboundCmOperations"></el-input>
              <span v-else>{{dataForm.configItemChange.outboundCmOperations}}</span>
            </el-form-item>
            <el-form-item label-width="80%" label="操作人：" style="width: 65%">
              <span>{{dataForm.configItemChange.operator}}</span>
              <span>{{dataForm.configItemChange.outboundOperator}}</span>
            </el-form-item>
            <el-form-item label="日期：" style="width: 20%">
              <span>{{dataForm.configItemChange.operateDate}}</span>
              <span>{{dataForm.configItemChange.outboundOperateDate}}</span>
            </el-form-item>
          </div>
        </div>
@@ -186,21 +186,21 @@
              <el-table-column prop="examineItem" min-width="300" label="检查项"></el-table-column>
              <el-table-column label="检查结果" width="250" align="center">
                <template slot-scope="scope">
                  <zt-dict :disabled="stepMarker!=='pzxrk_qash'" v-model="scope.row.examineResult" placeholder="检查结果"
                  <zt-dict :disabled="stepMarker!=='pzxbg_qash'" v-model="scope.row.examineResult" placeholder="检查结果"
                           dict="tristate2" :radio="true"
                           clearable></zt-dict>
                </template>
              </el-table-column>
              <el-table-column align="center" width="120" label="不适用说明">
                <template v-slot="{ row }">
                  <el-input v-if="stepMarker=='pzxrk_qash'" v-model="row.notApplyExplan" placeholder="不适用说明"></el-input>
                  <el-input v-if="stepMarker=='pzxbg_qash'" v-model="row.notApplyExplan" placeholder="不适用说明"></el-input>
                  <span v-else>{{row.notApplyExplan}}</span>
                </template>
              </el-table-column>
            </el-table>
            <div class="el-border-top">
              <el-form-item label="审核结果" style="width: 99%">
                <zt-dict :disabled="stepMarker!=='pzxrk_qash'" v-model="dataForm.configItemChange.qaAuditResults"
                <zt-dict :disabled="stepMarker!=='pzxbg_qash'" v-model="dataForm.configItemChange.qaAuditResults"
                         dict="is_pass" :radio="true"
                         clearable></zt-dict>
              </el-form-item>
@@ -225,21 +225,21 @@
              <el-table-column prop="examineItem" min-width="300" label="检查项"></el-table-column>
              <el-table-column label="检查结果" width="250" align="center">
                <template slot-scope="scope">
                  <zt-dict :disabled="stepMarker!=='pzxrk_cmsh'" v-model="scope.row.examineResult" placeholder="检查结果"
                  <zt-dict :disabled="stepMarker!=='pzxbg_cmsh'" v-model="scope.row.examineResult" placeholder="检查结果"
                           dict="tristate2" :radio="true"
                           clearable></zt-dict>
                </template>
              </el-table-column>
              <el-table-column prop="notApplyExplan" align="center" width="120" label="不适用说明">
                <template v-slot="{ row }">
                  <el-input v-if="stepMarker=='pzxrk_cmsh'" v-model="row.notApplyExplan" placeholder="不适用说明"></el-input>
                  <el-input v-if="stepMarker=='pzxbg_cmsh'" v-model="row.notApplyExplan" placeholder="不适用说明"></el-input>
                  <span v-else>{{row.notApplyExplan}}</span>
                </template>
              </el-table-column>
            </el-table>
            <div class="el-border-top">
              <el-form-item label="审核结果" style="width: 99%">
                <zt-dict :disabled="stepMarker!=='pzxrk_cmsh'" v-model="dataForm.configItemChange.cmAuditResults"
                <zt-dict :disabled="stepMarker!=='pzxbg_cmsh'" v-model="dataForm.configItemChange.cmAuditResults"
                         placeholder="审核结果" dict="is_pass" :radio="true"
                         clearable></zt-dict>
              </el-form-item>
@@ -259,15 +259,15 @@
          </div>
          <div style="width: calc(100% - 120px)" class="el-border-left">
            <el-form-item class="el-CMTextarea" style="width: 100%;padding: 5px">
              <el-input v-if="stepMarker=='pzxrk_cmcz'" type="textarea" :rows="2" placeholder="请输入内容"
                        v-model="dataForm.configItemChange.projectCmOperations"></el-input>
              <span v-else>{{dataForm.configItemChange.projectCmOperations}}</span>
              <el-input v-if="stepMarker=='pzxbg_cmcz'" type="textarea" :rows="2" placeholder="请输入内容"
                        v-model="dataForm.configItemChange.warehouseCmOperations"></el-input>
              <span v-else>{{dataForm.configItemChange.warehouseCmOperations}}</span>
            </el-form-item>
            <el-form-item label-width="80%" label="操作人：" style="width: 65%">
              <span>{{dataForm.configItemChange.operator}}</span>
              <span>{{dataForm.configItemChange.warehouseOperator}}</span>
            </el-form-item>
            <el-form-item label="日期：" style="width: 20%">
              <span>{{dataForm.configItemChange.operateDate}}</span>
              <span>{{dataForm.configItemChange.warehouseOperateDate}}</span>
            </el-form-item>
          </div>
        </div>
@@ -318,16 +318,23 @@
            qaAuditResults: "",
            qaAuditor: "",
            qaAuditDate: "",
            problemProcess:'',
            changeReason:'',
            cmAuditResults: "",
            cmAuditor: "",
            cmAuditDate: "",
            approvalOpinions: "",
            approvalSign: "",
            approvalDate: "",
            projectCmOperations: "",
            operator: "",
            operateDate: "",
            changeAnalysis: "",
            changeContent: "",
            implementer: "",
            changeDate: "",
            outboundCmOperations: "",
            outboundOperator: "",
            outboundOperateDate: "",
            warehouseCmOperations: "",
            warehouseOperator: "",
            warehouseOperateDate: "",
            remark: "",
          },
          project: {
@@ -371,7 +378,7 @@
        this.getInfo()
        if (!this.dataForm.disabled) {
          if (!row.stepMarker) {
            this.stepMarker = 'pzxrk_first'
            this.stepMarker = 'pzxbg_first'
            this.title = '入库申请'
          } else {
            this.title = row.stepName
@@ -447,7 +454,7 @@
        }
        if (submitType == 'tj' || submitType == 'bl') {
          let flowInfo = {
            flowCode: 'pzxrk',
            flowCode: 'pzxbg',
            stepIdMark: this.stepMarker,
            submitType: submitType
          }