重点工程

data-ui/src/views/data/generalbusiness/keyProjects/index.vue

@@ -389,6 +389,16 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="所属行政区" prop="administrativeRegion">
+              <el-select v-model="form.administrativeRegion" placeholder="请选择所属行政区" >
+                <el-option
+                  v-for="item in regionList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -613,6 +623,16 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="所属行政区" prop="administrativeRegion">
+              <el-select v-model="form.administrativeRegion" placeholder="" disabled>
+                <el-option
+                  v-for="item in regionList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -749,6 +769,29 @@ export default {
           value:'0'
         }
       ],
+      regionList:[
+        {
+          id:'369',
+          name:'双辽市'
+        },
+        {
+          id:'370',
+          name:'伊通县'
+        },
+        {
+          id:'371',
+          name:'梨树县'
+        },
+        {
+          id:'372',
+          name:'铁东区'
+        },
+        {
+          id:'373',
+          name:'铁西区'
+        },
+      ],
+
       // 是否显示弹出层
       open: false,
       scheduleUpload: false,
@@ -798,24 +841,9 @@ export default {
         projectName: [
           {required: true, message: "项目名称不能为空", trigger: "blur"}
         ],
-       /* territoriality: [
-          {required: true, message: "属地辖区不能为空", trigger: ["blur", "change"]}
-        ],*/
-        /*principal: [
-          {required: true, message: "负责人不能为空", trigger: "blur"}
-        ],*/
-        /*constructionSite: [
-          {required: true, message: "建设地点不能为空", trigger: "blur"}
-        ],*/
         nature: [
           {required: true, message: "在建性质不能为空", trigger: "blur"}
         ],
-        /*    projectTarget: [
-              {required: true, message: "工程目标不能为空", trigger: "blur"}
-            ],
-            projectLevel: [
-              {required: true, message: "工程属地不能为空", trigger: "change"}
-            ],*/
         longitude: [
           {required: true, message: "经度不能为空", trigger: ["blur", "change"]},
           {validator: checkLon, trigger: 'blur'}
@@ -830,14 +858,10 @@ export default {
         parkLatitude: [
           {validator: checkLat, trigger: ["blur", "change"]}
         ],
-        // introduction: [
-        //   {required: true, message: "建设内容不能为空", trigger: "blur"}
-        // ],
         cameraSystem: [
           {required: true, message: "所属分类不能为空", trigger: "change"}
         ],
         phone: [
-          // {required: true, message: "联系电话不能为空", trigger: "blur"},
           {validator: validPhoneMobile, trigger: 'blur'}
         ],
         totalInvest: [
@@ -882,9 +906,6 @@ export default {
       this.$refs.selectRef6.blur();
       this.$refs.selectRef7.blur();
     },
-    handleClick() {
-      alert('button click');
-    },
     // 更多操作触发
     handleCommand(command, row) {
       switch (command) {
@@ -1053,7 +1074,8 @@ export default {
         thisYearCumulativeInvestment: null,
         realityCompletedTime: null,
         springStartProject: null,
-        startTime: null
+        startTime: null,
+        administrativeRegion: null
       };
       this.resetForm("form");
     },

src/main/java/com/sooka/sponest/data/generalbusiness/domain/CenterdataTKeyProjects.java

@@ -283,15 +283,15 @@ public class CenterdataTKeyProjects extends BaseBusinessEntity {
     @DateTimeFormat(pattern = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM")
     @ApiModelProperty(value = "续建项目首次开工时间", required = false)
-    @Excel(name = "续建项目首次开工时间")
+    @Excel(name = "续建项目首次开工时间",dateFormat = "yyyy-MM")
     private Date continuationProjectStartTime;
 
     @ApiModelProperty(value = "是否入统计库", required = false)
-    @Excel(name = "是否入统计库")
+    @Excel(name = "是否入统计库",readConverterExp="0=否,1=是")
     private String joinStatisticalBank;
 
     @ApiModelProperty(value = "是否入统", required = false)
-    @Excel(name = "是否入统")
+    @Excel(name = "是否入统",readConverterExp="0=否,1=是")
     private String joinStatistical;
 
     @ApiModelProperty(value = "1-N月入统投资", required = false)
@@ -305,13 +305,17 @@ public class CenterdataTKeyProjects extends BaseBusinessEntity {
     @DateTimeFormat(pattern = "yyyy-MM")
     @JsonFormat(pattern = "yyyy-MM")
     @ApiModelProperty(value = "实际竣工时间", required = false)
-    @Excel(name = "实际竣工时间")
+    @Excel(name = "实际竣工时间",dateFormat = "yyyy-MM")
     private Date realityCompletedTime;
 
     @ApiModelProperty(value = "是否春季集中开复工项目", required = false)
-    @Excel(name = "是否春季集中开复工项目")
+    @Excel(name = "是否春季集中开复工项目",readConverterExp="0=否,1=是")
     private String springStartProject;
 
+    @ApiModelProperty(value = "所属行政区", required = false)
+    @Excel(name = "所属行政区",readConverterExp="369=双辽市,370=伊通县,371=梨树县,372=铁东区,373=铁西区")
+    private String administrativeRegion;
+
     @ApiModelProperty(value = "报文", required = false)
     private String message;
 
@@ -319,6 +323,14 @@ public class CenterdataTKeyProjects extends BaseBusinessEntity {
     @NotBlank(message = "项目id不能为空")
     private String projectId;
 
+    public String getAdministrativeRegion() {
+        return administrativeRegion;
+    }
+
+    public void setAdministrativeRegion(String administrativeRegion) {
+        this.administrativeRegion = administrativeRegion;
+    }
+
     public String getProjectId() {
         return projectId;
     }

src/main/resources/mapper/generalbusiness/CenterdataTKeyProjectsMapper.xml

@@ -54,13 +54,15 @@
         <result property="thisYearCumulativeInvestment" column="thisyear_cumulative_investment"/>
         <result property="realityCompletedTime" column="reality_completed_time"/>
         <result property="springStartProject" column="spring_start_project"/>
+        <result property="administrativeRegion" column="administrative_region"/>
         <result property="projectId" column="project_id"/>
     </resultMap>
 
     <sql id="selectCenterdataTKeyProjectsVo">
         select id, project_name, project_target, project_type, project_level, construction_unit, principal, phone, construction_site, construction_area, longitude, latitude, camera_system, dept_id, dept_name, order_num, introduction,
         photo_id, create_time, create_by, create_name, update_time, update_by, update_name, territoriality, park, park_longitude, park_latitude, environment, legal_unit, start_time, end_time, nature, total_invest, year_invest, industry_type,
-        secretary, secretary_duties, secretary_phone,project_id,continuation_project_invest,continuation_project_start_time,join_statistical_bank,join_statistical,join_statistical_invest,thisyear_cumulative_investment,reality_completed_time,spring_start_project
+        secretary, secretary_duties, secretary_phone,project_id,continuation_project_invest,continuation_project_start_time,join_statistical_bank,join_statistical,join_statistical_invest,thisyear_cumulative_investment,reality_completed_time,
+        spring_start_project,administrative_region
         from centerdata_t_key_projects
     </sql>
 
@@ -163,6 +165,7 @@
             <if test="thisYearCumulativeInvestment != null">thisyear_cumulative_investment,</if>
             <if test="realityCompletedTime != null">reality_completed_time,</if>
             <if test="springStartProject != null">spring_start_project,</if>
+            <if test="administrativeRegion != null">administrative_region,</if>
             <if test="projectId != null">project_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -214,6 +217,7 @@
             <if test="thisYearCumulativeInvestment != null">#{thisYearCumulativeInvestment},</if>
             <if test="realityCompletedTime != null">#{realityCompletedTime},</if>
             <if test="springStartProject != null">#{springStartProject},</if>
+            <if test="administrativeRegion != null">#{administrativeRegion},</if>
             <if test="projectId != null">#{projectId},</if>
         </trim>
     </insert>
@@ -268,6 +272,7 @@
             <if test="thisYearCumulativeInvestment != null">thisyear_cumulative_investment = #{thisYearCumulativeInvestment},</if>
             <if test="realityCompletedTime != null">reality_completed_time = #{realityCompletedTime},</if>
             <if test="springStartProject != null">spring_start_project = #{springStartProject},</if>
+            <if test="administrativeRegion != null">administrative_region = #{administrativeRegion},</if>
         </trim>
         where id = #{id}
     </update>
@@ -345,6 +350,7 @@
             <if test="thisYearCumulativeInvestment != null">thisyear_cumulative_investment = #{thisYearCumulativeInvestment},</if>
             <if test="realityCompletedTime != null">reality_completed_time = #{realityCompletedTime},</if>
             <if test="springStartProject != null">spring_start_project = #{springStartProject},</if>
+            <if test="administrativeRegion != null">administrative_region = #{administrativeRegion},</if>
         </trim>
         where project_id = #{projectId}
     </update>