需求回归

jwtech-admin-page/src/views/marketSupervision/enterpriseInformation/options/components/newGoodCredit.vue

@@ -54,12 +54,14 @@
         label="良好行为"
         align="left"
         prop="behavior"
+        :formatter="behaviorFormat"
         min-width="120"
       />
       <el-table-column
         label="表彰等级"
         align="left"
         prop="commendationLevel"
+        :formatter="commendationLevelFormat"
         min-width="120"
       />
       <el-table-column
@@ -67,6 +69,7 @@
         align="left"
         prop="authority"
         min-width="120"
+        :formatter="authorityFormat"
       />
       <el-table-column
         label="加分值"
@@ -325,20 +328,53 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="良好行为" prop="behavior">
-              <el-input v-model="form.behavior" placeholder="请输入良好行为" />
+              <el-select
+                v-model="form.behavior"
+                placeholder="请选择良好行为"
+                style="width: 100%"
+
+              >
+                <el-option
+                  v-for="dict in behaviorOption"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="表彰等级" prop="commendationLevel">
-              <el-input
+              <el-select
                 v-model="form.commendationLevel"
-                placeholder="请输入表彰等级"
+                placeholder="请选择表彰等级"
-              />
+                style="width: 100%"
+
+              >
+                <el-option
+                  v-for="dict in commendationLevelOption"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="颁奖机构" prop="authority">
-              <el-input v-model="form.authority" placeholder="请输入颁发机构" />
+              <el-select
+                v-model="form.authority"
+                placeholder="请选择颁奖机构"
+                style="width: 100%"
+
+              >
+                <el-option
+                  v-for="dict in authorityOption"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -440,9 +476,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="是否省属项目" prop="provinceBelong">
+            <el-form-item label="是否省属项目" prop="remark">
               <el-select
-                v-model="form.provinceBelong"
+                v-model="form.remark"
                 placeholder="请选择是否"
                 style="width: 100%"
               >
@@ -533,15 +569,15 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 良好行为 </template>
-            {{ this.creditMsg.behavior }}
+            {{ behaviorFormat(this.creditMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 表彰等级 </template>
-            {{ this.creditMsg.commendationLevel }}
+            {{ commendationLevelFormat(this.creditMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 颁发机构 </template>
-            {{ this.creditMsg.authority }}
+            {{ authorityFormat(this.creditMsg) }}
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 加分值 </template>
@@ -573,7 +609,10 @@
             <template slot="label"> 是否在一年内填报 </template>
             {{ isFormat(this.creditMsg.fillOnYear) }}
           </el-descriptions-item>
-
+          <el-descriptions-item>
+            <template slot="label"> 是否省属项目 </template>
+            {{ isFormat(this.creditMsg.remark) }}
+          </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 附件 </template>
             <template v-if="this.creditMsg.attachment">
@@ -813,7 +852,7 @@ export default {
         isWaterCon: [
           { required: true, message: "请选择是否", trigger: "blur" },
         ],
-        provinceBelong: [
+        remark: [
           { required: true, message: "请选择是否", trigger: "blur" },
         ],
         fillOnYear: [
@@ -865,9 +904,21 @@ export default {
       remark: "",
       processList: [],
       projectNameOption: [],
+      behaviorOption:[],
+      commendationLevelOption:[],
+      authorityOption:[],
     };
   },
   created() {
+    this.getDicts("resiger_institution").then((response) => {
+      this.authorityOption = response.data;
+    });
+    this.getDicts("good_level").then((response) => {
+      this.commendationLevelOption = response.data;
+    });
+    this.getDicts("good_havior").then((response) => {
+      this.behaviorOption = response.data;
+    });
     this.getDicts("whether").then((response) => {
       this.isOptions = response.data;
     });
@@ -889,6 +940,15 @@ export default {
     );
   },
   methods: {
+    authorityFormat(row, column) {
+      return this.selectDictLabel(this.authorityOption, row.authority);
+    },
+    commendationLevelFormat(row, column) {
+      return this.selectDictLabel(this.commendationLevelOption, row.commendationLevel);
+    },
+    behaviorFormat(row, column) {
+      return this.selectDictLabel(this.behaviorOption, row.behavior);
+    },
     isFormat(row, column) {
       return this.selectDictLabel(this.isFormat, row);
     },
@@ -1206,28 +1266,28 @@ export default {
     passExamine() {
       this.creditMsg.status = "3";
       this.creditMsg.bonusPointBegin = Date.now();
-      const currentDate = new Date();
+      // const currentDate = new Date();
-      currentDate.setFullYear(
+      // currentDate.setFullYear(
-        currentDate.getFullYear() + this.creditMsg.validity
+      //   currentDate.getFullYear() + this.creditMsg.validity
-      );
+      // );
-      const date = currentDate.getTime();
+      // const date = currentDate.getTime();
-      // this.creditMsg.validityPeriod=date
+      // // this.creditMsg.validityPeriod=date
-      console.log(currentDate.getTime());
+      // console.log(currentDate.getTime());
-
+      //
-      console.log(
+      // console.log(
-        "this.creditMsg.validityPeriod",
+      //   "this.creditMsg.validityPeriod",
-        this.creditMsg.validityPeriod
+      //   this.creditMsg.validityPeriod
-      );
+      // );
-
+      //
-      console.log("formattedDate", this.formatDate(currentDate));
+      // console.log("formattedDate", this.formatDate(currentDate));
 
-      // updateCredit(this.creditMsg).then((response) => {
+      updateCredit(this.creditMsg).then((response) => {
-      //   if (response.code === 200) {
+        if (response.code === 200) {
-      //     this.msgSuccess("审核通过成功");
+          this.msgSuccess("审核通过成功");
-      //     this.viewOpen = false;
+          this.viewOpen = false;
-      //     this.getList();
+          this.getList();
-      //   }
+        }
-      // });
+      });
     },
 
     publicity() {

jwtech-admin-page/src/views/marketSupervision/goodConductAudit/index.vue

@@ -10,18 +10,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="isUse">
+      <el-form-item label="状态" prop="status">
         <el-select
-          v-model="queryParams.data.type"
+          v-model="queryParams.data.status"
-          placeholder="选择状态"
+          placeholder="请选择状态"
           clearable
           size="small"
           style="width: 100%"
           @change="handleQuery"
         >
-          <el-option label="待审核" :value="3">待审核</el-option>
+          <el-option
-          <!-- 第二个选项，值为 4，显示文本为 '已审核' -->
+            v-for="dict in typeOptions"
-          <el-option label="已审核" :value="4">已审核</el-option>
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -656,7 +659,7 @@ export default {
       // 选中数组
       ids: [],
       isMajorProjectOptions:[],
-
+      typeOptions:[],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -711,8 +714,8 @@ export default {
           validityPeriod: null,
           awardAnnouncementWebsite: null,
           attachment: null,
-          status: null,
+          status: "2",
-          type: 4,
+          type: null,
           badBehavior: null,
           createUid: null,
           updateUid: null,
@@ -766,8 +769,12 @@ export default {
       projectNameOption: [],
     };
   },
-  created() {
+  async created() {
-
+    const typeOptionsRes = await this.getDicts("zt_status")
+    this.typeOptions = typeOptionsRes.data;
+    // this.getDicts("zt_status").then((response) => {
+    //   this.typeOptions = response.data;
+    // });
     listInfo(this.proQueryParams).then((response) => {
       this.projectNameOptions = response.records;
     });
@@ -929,6 +936,7 @@ export default {
     getList() {
       this.loading = true;
       this.queryParams.data.type = "1";
+
       listCredit(this.queryParams).then((response) => {
         this.creditList = response.records;
         this.total = response.total;

jwtech-pc-page/static/config.js

@@ -10,7 +10,7 @@ window.g = {
   // url: "http://106.2.224.58:1036/kms-pc-web/api",
   // url: "http://106.2.224.58:1039/kms-pc-web",
   // url: "http://192.168.2.100:18082/tianhui-admin-web",
-  url: "http://175.178.86.109:18082/kms-pc-web",
+  url: "http://127.0.0.1:18080/kms-pc-web",
   // url: "http://127.0.0.1:18082/kms-pc-web",
 
   // url: "http://192.168.1.113:8083/kms-pc-web",

jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdDynamicCreditController.java

@@ -33,6 +33,7 @@ import com.kms.enterprise.mapper.BsSgcYxjdDynamicCreditMapper;
 import com.kms.enterprise.service.*;
 import com.kms.framework.manager.factory.AsyncFactory;
 import com.kms.system.domain.SysUserRole;
+import com.kms.system.domain.SysXzqh;
 import com.kms.system.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -102,6 +103,7 @@ public class BsSgcYxjdDynamicCreditController extends BaseController {
     @Autowired
     private SysXzqhService sysXzqhService;
 
+
     /**
      * 获取企业良好行为
      * @param dto
@@ -147,6 +149,10 @@ public class BsSgcYxjdDynamicCreditController extends BaseController {
     public IPage list(@RequestBody SearchParam<BsSgcYxjdDynamicCredit> sp) {
 
         SysUser user = UserUtils.getUser();
+        String deptId = user.getDeptId();
+//        SysDept sysDept = sysDeptService.get(deptId);
+//        String xzqhId = sysDept.getXzqhId();
+//        SysXzqh xzqh = sysXzqhService.getById(xzqhId.substring(0, 6));
         if (user.getUserName().equals("admin")) {
             LambdaQueryWrapper<BsSgcYxjdDynamicCredit> queryWrapper = Wrappers.lambdaQuery(BsSgcYxjdDynamicCredit.class);
             String enterpriseName = sp.getData().getEnterpriseName();
@@ -159,6 +165,10 @@ public class BsSgcYxjdDynamicCreditController extends BaseController {
             if (StringUtils.isNotBlank(enterpriseId1)) {
                 queryWrapper.eq(BsSgcYxjdDynamicCredit::getEnterpriseId,enterpriseId1);
             }
+            String status = sp.getData().getStatus();
+            if (StringUtils.isNotBlank(status)){
+                queryWrapper.eq(BsSgcYxjdDynamicCredit::getStatus,status);
+            }
             String qualificationCategory = sp.getData().getQualificationCategory();
             if (StringUtils.isNotBlank(qualificationCategory)){
                 queryWrapper.eq(BsSgcYxjdDynamicCredit::getQualificationCategory,qualificationCategory);
@@ -213,6 +223,10 @@ public class BsSgcYxjdDynamicCreditController extends BaseController {
                 LambdaQueryWrapper<BsSgcYxjdDynamicCredit> queryWrapper = Wrappers.lambdaQuery(BsSgcYxjdDynamicCredit.class);
                 queryWrapper.eq(BsSgcYxjdDynamicCredit::getStatus, "1").or().eq(BsSgcYxjdDynamicCredit::getStatus, "4")
                         .orderByDesc(BsSgcYxjdDynamicCredit::getCreateTime);
+                String status = sp.getData().getStatus();
+                if (StringUtils.isNotBlank(status)){
+                    queryWrapper.eq(BsSgcYxjdDynamicCredit::getStatus,status);
+                }
                 List<BsSgcYxjdDynamicCredit> list = bsSgcYxjdDynamicCreditService.list(queryWrapper);
                 IPage<BsSgcYxjdDynamicCredit> page = bsSgcYxjdDynamicCreditService.selectPage(sp);
                 creditList.addAll(list);
@@ -233,7 +247,15 @@ public class BsSgcYxjdDynamicCreditController extends BaseController {
                 }else {
                     queryWrapper.apply("exists (select 1 from bs_sgc_yxjd_enterprise_info where id = bs_sgc_yxjd_dynamic_credit.enterprise_id)",null);
                 }
-
+//                if (StringUtils.isNotBlank(xzqhId)&&xzqh.getLayer().equals(1)){
+//                    queryWrapper.likeRight(BsSgcYxjdDynamicCredit::getDeclarationManagementZones,sysXzqhService.getSubString(xzqhId));
+//                }else {
+//                    queryWrapper.eq(BsSgcYxjdDynamicCredit::getRemark,"1").likeRight(BsSgcYxjdDynamicCredit::getDeclarationManagementZones,sysXzqhService.getSubString(xzqhId));
+//                }
+                String status = sp.getData().getStatus();
+                if (StringUtils.isNotBlank(status)){
+                    queryWrapper.eq(BsSgcYxjdDynamicCredit::getStatus,status);
+                }
                 String enterpriseId1 = sp.getData().getEnterpriseId();
                 if (StringUtils.isNotBlank(enterpriseId1)) {
                     queryWrapper.eq(BsSgcYxjdDynamicCredit::getEnterpriseId,enterpriseId1);

jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdDynamicCredit.java

@@ -136,9 +136,9 @@ public class BsSgcYxjdDynamicCredit extends BaseEntity
 
     @ApiModelProperty("是否在这一年填报")
     private String fillOnYear;
-
+//
-    @ApiModelProperty("是否属于省属项目")
+//    @ApiModelProperty("是否属于省属项目")
-    private String provinceBelong;
+//    private String provinceBelong;
 
     @ApiModelProperty("企业填报时间")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")

jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEngineerPerformanceRecord.java

@@ -97,7 +97,7 @@ public class BsSgcYxjdEngineerPerformanceRecord extends BaseEntity
     /** 合同价 */
     @Excel(name = "合同价")
     @ApiModelProperty("合同价")
-    private BigDecimal contractPrice;
+    private String contractPrice;
 
     /** 项目获奖情况 */
     @Excel(name = "项目获奖情况")

jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdDynamicCreditService.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.AjaxResult;
 import com.kms.enterprise.domain.dto.BadHaviorDto;
 import com.kms.enterprise.domain.dto.DisclosureDto;
+import com.kms.system.service.SysXzqhService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,13 +37,16 @@ public class BsSgcYxjdDynamicCreditService extends BaseService<BsSgcYxjdDynamicC
     @Autowired
     private BsSgcYxjdDynamicCreditMapper bsSgcYxjdDynamicCreditMapper;
 
+    @Autowired
+    private SysXzqhService xzqhService;
+
     public AjaxResult getBadLimit() {
 
         return AjaxResult.success(bsSgcYxjdDynamicCreditMapper.getBadLimit());
     }
 
     public IPage getBad(DisclosureDto dto) {
-        IPage<BadHaviorDto> page = bsSgcYxjdDynamicCreditMapper.getBad(new Page<>(dto.getPageNum(),dto.getPageSize()),dto.getAdcd(), dto.getEnterpriseName(),
+        IPage<BadHaviorDto> page = bsSgcYxjdDynamicCreditMapper.getBad(new Page<>(dto.getPageNum(),dto.getPageSize()),xzqhService.getSubString(dto.getAdcd()), dto.getEnterpriseName(),
                 dto.getQualificationCategory());
 //        Page<BadHaviorDto> page = new Page<>(dto.getPageNum(), dto.getPageSize());
 //        if (CollectionUtil.isNotEmpty(bad)) {
@@ -203,7 +207,7 @@ public class BsSgcYxjdDynamicCreditService extends BaseService<BsSgcYxjdDynamicC
     }
 
     public IPage getGood(DisclosureDto dto) {
-        IPage<BadHaviorDto> page = bsSgcYxjdDynamicCreditMapper.getGood(dto.getAdcd(), dto.getEnterpriseName(),
+        IPage<BadHaviorDto> page = bsSgcYxjdDynamicCreditMapper.getGood(xzqhService.getSubString(dto.getAdcd()), dto.getEnterpriseName(),
                 dto.getQualificationCategory(), new Page<>(dto.getPageNum(), dto.getPageSize()));
 
 

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdDynamicCreditMapper.xml

@@ -100,12 +100,10 @@
                                                            dc.qualification_category = q.qualification_category
         <where>
            1=1
-            <if test="adcd!=null and adcd!='' and adcd != '省外'">
+            <if test="adcd!=null and adcd!=''">
-                adcd =#{adcd}
+               and ei.adcd like concat(#{adcd},'%')
-            </if>
-            <if test="adcd!=null and adcd!='' and adcd == '省外'">
-                AND left(adcd,2)&lt;> '44'
             </if>
+
             <if test="enterpriseName!=null and enterpriseName!=''">
                 and enterprise_name like concat('%',#{enterpriseName},'%')
             </if>
@@ -122,12 +120,13 @@
         from bs_sgc_yxjd_dynamic_credit dc
         left join bs_sgc_yxjd_enterprise_info i on dc.enterprise_id = i.id
         <where>
-            <if test="adcd!=null and adcd!='' and adcd != '省外'">
+            <if test="adcd!=null and adcd!=''">
-                adcd =#{adcd}
+                i.adcd like concat(#{adcd},'%')
-            </if>
-            <if test="adcd!=null and adcd!='' and adcd == '省外'">
-                AND left(adcd,2)&lt;> '44'
             </if>
+
+<!--            <if test="adcd!=null and adcd!='' and adcd == '省外'">-->
+<!--                AND left(adcd,2)&lt;> '44'-->
+<!--            </if>-->
             <if test="enterpriseName!=null and enterpriseName!=''">
                 and i.enterprise_name like concat('%',#{enterpriseName},'%')
             </if>