超限运输及智慧建设代码修改提交

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgLzglCxysxkController.java

@@ -84,8 +84,6 @@ public class ZhjgLzglCxysxkController extends BaseController  {
   @SysLog("新增超限运输许可表")
   @PostMapping
   public R save(@RequestBody ZhjgLzglCxysxk zhjgLzglCxysxk){
-    String uuid = UUID.randomUUID().toString().replaceAll("-","").toUpperCase();
-    zhjgLzglCxysxk.setId(uuid);
     return new R<>(zhjgLzglCxysxkService.save(zhjgLzglCxysxk));
   }
 

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/entity/ZhjgLzglCxysxk.java

@@ -113,4 +113,12 @@ private static final long serialVersionUID = 1L;
    * 办理范围
    */
   private String blfw;
+  /**
+   * 状态
+   */
+  private Integer status;
+  /**
+   * 是否跨省(1代表跨省, 2代表不跨省)
+   */
+  private Integer ifks;
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/controller/ZhjsGchtandgcxmVController.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGchtandgcxmV;
+import com.elephant.framework.galaxy.aroad.module.zhjs.service.ZhjsGchtandgcxmVService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * VIEW
+ *
+ * @author wangjian
+ * @date 2019-04-08 15:22:28
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjs/htgl")
+public class ZhjsGchtandgcxmVController extends BaseController  {
+
+  private final  ZhjsGchtandgcxmVService zhjsGchtandgcxmVService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhjsGchtandgcxmV VIEW
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhjsGchtandgcxmVPage(Page page, ZhjsGchtandgcxmV zhjsGchtandgcxmV) {
+    return  new R<>(zhjsGchtandgcxmVService.page(page,Wrappers.query(zhjsGchtandgcxmV)));
+  }
+
+
+  /**
+   * 通过id查询VIEW
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhjsGchtandgcxmVService.getById(id));
+  }
+
+  /**
+   * 新增VIEW
+   * @param zhjsGchtandgcxmV VIEW
+   * @return R
+   */
+  @SysLog("新增VIEW")
+  @PostMapping
+  public R save(@RequestBody ZhjsGchtandgcxmV zhjsGchtandgcxmV){
+    return new R<>(zhjsGchtandgcxmVService.save(zhjsGchtandgcxmV));
+  }
+
+  /**
+   * 修改VIEW
+   * @param zhjsGchtandgcxmV VIEW
+   * @return R
+   */
+  @SysLog("修改VIEW")
+  @PutMapping
+  public R updateById(@RequestBody ZhjsGchtandgcxmV zhjsGchtandgcxmV){
+    return new R<>(zhjsGchtandgcxmVService.updateById(zhjsGchtandgcxmV));
+  }
+
+  /**
+   * 通过id删除VIEW
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除VIEW")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhjsGchtandgcxmVService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/controller/ZhjsGcxmController.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.elephant.framework.galaxy.aroad.response.R;
+import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
+import com.elephant.framework.galaxy.aroad.module.zhjs.service.ZhjsGcxmService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+
+
+/**
+ * 工程项目信息表
+
+ *
+ * @author wangjian
+ * @date 2019-04-08 18:14:32
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/zhjs/gcxm")
+public class ZhjsGcxmController extends BaseController  {
+
+  private final  ZhjsGcxmService zhjsGcxmService;
+
+  /**
+   * 分页查询
+   * @param page 分页对象
+   * @param zhjsGcxm 工程项目信息表
+
+   * @return
+   */
+  @GetMapping("/page")
+  public R getZhjsGcxmPage(Page page, ZhjsGcxm zhjsGcxm) {
+    return  new R<>(zhjsGcxmService.page(page,Wrappers.query(zhjsGcxm)));
+  }
+
+
+  /**
+   * 通过id查询工程项目信息表
+
+   * @param id id
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R getById(@PathVariable("id") String id){
+    return new R<>(zhjsGcxmService.getById(id));
+  }
+
+  /**
+   * 新增工程项目信息表
+
+   * @param zhjsGcxm 工程项目信息表
+
+   * @return R
+   */
+  @SysLog("新增工程项目信息表")
+  @PostMapping
+  public R save(@RequestBody ZhjsGcxm zhjsGcxm){
+    return new R<>(zhjsGcxmService.save(zhjsGcxm));
+  }
+
+  /**
+   * 修改工程项目信息表
+
+   * @param zhjsGcxm 工程项目信息表
+
+   * @return R
+   */
+  @SysLog("修改工程项目信息表")
+  @PutMapping
+  public R updateById(@RequestBody ZhjsGcxm zhjsGcxm){
+    return new R<>(zhjsGcxmService.updateById(zhjsGcxm));
+  }
+
+  /**
+   * 通过id删除工程项目信息表
+
+   * @param id id
+   * @return R
+   */
+  @SysLog("删除工程项目信息表")
+  @DeleteMapping("/{id}")
+  public R removeById(@PathVariable String id){
+    return new R<>(zhjsGcxmService.removeById(id));
+  }
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/entity/ZhjsGchtandgcxmV.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * VIEW
+ *
+ * @author wangjian
+ * @date 2019-04-08 15:22:28
+ */
+@Data
+@TableName("t_zhjs_gchtandgcxm_v")
+@EqualsAndHashCode(callSuper = true)
+public class ZhjsGchtandgcxmV extends Model<ZhjsGchtandgcxmV> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * id
+   */
+  @TableId
+  private String id;
+  /**
+   * 合同编号
+   */
+  private String code;
+  /**
+   * 合同名称
+   */
+  private String name;
+  /**
+   * 合同类型
+   */
+  private Integer type;
+  /**
+   * 签订单位
+   */
+  private String unitname;
+  /**
+   * 负责人
+   */
+  private String principal;
+  /**
+   * 签订日期
+   */
+  private LocalDateTime signdate;
+  /**
+   * 合同总金额
+   */
+  private BigDecimal conamount;
+  /**
+   * 附件列表
+   */
+  private String filelist;
+  /**
+   * 项目名称
+   */
+  private String proname;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/entity/ZhjsGcxm.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 工程项目信息表
+
+ *
+ * @author wangjian
+ * @date 2019-04-08 18:14:32
+ */
+@Data
+@TableName("t_zhjs_gcxm")
+@EqualsAndHashCode(callSuper = true)
+public class ZhjsGcxm extends Model<ZhjsGcxm> {
+private static final long serialVersionUID = 1L;
+
+  /**
+   * id
+   */
+  @TableId
+  private String id;
+  /**
+   * 项目编号
+   */
+  private String code;
+  /**
+   * 项目名称
+   */
+  private String proname;
+  /**
+   * 报表项目名称
+   */
+  private String reportitemname;
+  /**
+   * 项目简名称
+   */
+  private String proabbreviation;
+  /**
+   * 项目属性
+   */
+  private Integer attribute;
+  /**
+   * 建设性质
+   */
+  private Integer property;
+  /**
+   * 项目级别
+   */
+  private Integer level;
+  /**
+   * 建设单位
+   */
+  private String constructionunit;
+  /**
+   * 设计单位
+   */
+  private String designunit;
+  /**
+   * 计划开工日期
+   */
+  private LocalDateTime planstartdate;
+  /**
+   * 计划完工日期
+   */
+  private LocalDateTime planenddate;
+  /**
+   * 实际开工日期
+   */
+  private LocalDateTime startdate;
+  /**
+   * 实际完工日期
+   */
+  private LocalDateTime enddate;
+  /**
+   * 主要工程量
+   */
+  private String quantities;
+  /**
+   * 招标价（万元）
+   */
+  private BigDecimal bid;
+  /**
+   * 省投资（万元）
+   */
+  private BigDecimal provinceinvest;
+  /**
+   * 中央投资（万元）
+   */
+  private BigDecimal centreinvest;
+  /**
+   * 概算总投资（万元）
+   */
+  private BigDecimal estimate;
+  /**
+   * 计划文号
+   */
+  private String planno;
+  /**
+   * 分管领导
+   */
+  private String branched;
+  /**
+   * 项目所在县、市、区
+   */
+  private String address;
+  /**
+   * 路面结构
+   */
+  private String structure;
+  /**
+   * 建设标准、规模及主要控制部位情况
+   */
+  private String proinfo;
+  /**
+   * 排序
+   */
+  private Integer sort;
+  /**
+   * 管辖地市ID
+   */
+  private String managesorgid;
+  /**
+   * 管辖地市名字
+   */
+  private String managesorgname;
+  /**
+   * 所属地市
+   */
+  private String city;
+  /**
+   * 起始桩号
+   */
+  private String startstation;
+  /**
+   * 终止桩号
+   */
+  private String endstation;
+  /**
+   * 坐标信息
+   */
+  private String xy;
+  /**
+   * 投资模式
+   */
+  private Integer invmodel;
+  /**
+   * 里程
+   */
+  private BigDecimal mileage;
+  /**
+   * 备注
+   */
+  private String remark;
+  /**
+   * 项目介绍
+   */
+  private String introduce;
+  /**
+   * 项目类型
+   */
+  private String type;
+  /**
+   * 项目法人
+   */
+  private String legalperson;
+  /**
+   * 路线全长
+   */
+  private BigDecimal spanlength;
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/mapper/ZhjsGchtandgcxmVMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGchtandgcxmV;
+
+/**
+ * VIEW
+ *
+ * @author wangjian
+ * @date 2019-04-08 15:22:28
+ */
+public interface ZhjsGchtandgcxmVMapper extends BaseMapper<ZhjsGchtandgcxmV> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/mapper/ZhjsGcxmMapper.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
+
+/**
+ * 工程项目信息表
+
+ *
+ * @author wangjian
+ * @date 2019-04-08 18:14:32
+ */
+public interface ZhjsGcxmMapper extends BaseMapper<ZhjsGcxm> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/ZhjsGchtandgcxmVService.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGchtandgcxmV;
+
+/**
+ * VIEW
+ *
+ * @author wangjian
+ * @date 2019-04-08 15:22:28
+ */
+public interface ZhjsGchtandgcxmVService extends IService<ZhjsGchtandgcxmV> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/ZhjsGcxmService.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
+
+/**
+ * 工程项目信息表
+
+ *
+ * @author wangjian
+ * @date 2019-04-08 18:14:32
+ */
+public interface ZhjsGcxmService extends IService<ZhjsGcxm> {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/impl/ZhjsGchtandgcxmVServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGchtandgcxmV;
+import com.elephant.framework.galaxy.aroad.module.zhjs.mapper.ZhjsGchtandgcxmVMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjs.service.ZhjsGchtandgcxmVService;
+import org.springframework.stereotype.Service;
+
+/**
+ * VIEW
+ *
+ * @author wangjian
+ * @date 2019-04-08 15:22:28
+ */
+@Service
+public class ZhjsGchtandgcxmVServiceImpl extends ServiceImpl<ZhjsGchtandgcxmVMapper, ZhjsGchtandgcxmV> implements ZhjsGchtandgcxmVService {
+
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/zhjs/service/impl/ZhjsGcxmServiceImpl.java

+package com.elephant.framework.galaxy.aroad.module.zhjs.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm;
+import com.elephant.framework.galaxy.aroad.module.zhjs.mapper.ZhjsGcxmMapper;
+import com.elephant.framework.galaxy.aroad.module.zhjs.service.ZhjsGcxmService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 工程项目信息表
+
+ *
+ * @author wangjian
+ * @date 2019-04-08 18:14:32
+ */
+@Service
+public class ZhjsGcxmServiceImpl extends ServiceImpl<ZhjsGcxmMapper, ZhjsGcxm> implements ZhjsGcxmService {
+
+}

src/main/resources/mapper/zhjg/ZhjgLzglCxysxkMapper.xml

@@ -28,5 +28,7 @@
         <result property="slr" column="slr"/>
         <result property="dwjb" column="dwjb"/>
         <result property="blfw" column="blfw"/>
+        <result property="status" column="status"/>
+        <result property="ifks" column="ifks"/>
   </resultMap>
 </mapper>

src/main/resources/mapper/zhjs/ZhjsGchtandgcxmVMapper.xml

+<?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.elephant.framework.galaxy.aroad.module.zhjs.mapper.ZhjsGchtandgcxmVMapper">
+
+  <resultMap id="zhjsGchtandgcxmVMap" type="com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGchtandgcxmV">
+        <id property="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="name" column="name"/>
+        <result property="type" column="type"/>
+        <result property="unitname" column="unitName"/>
+        <result property="principal" column="principal"/>
+        <result property="signdate" column="signDate"/>
+        <result property="conamount" column="conamount"/>
+        <result property="filelist" column="fileList"/>
+        <result property="proname" column="proname"/>
+  </resultMap>
+</mapper>

src/main/resources/mapper/zhjs/ZhjsGcxmMapper.xml

+<?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.elephant.framework.galaxy.aroad.module.zhjs.mapper.ZhjsGcxmMapper">
+
+  <resultMap id="zhjsGcxmMap" type="com.elephant.framework.galaxy.aroad.module.zhjs.entity.ZhjsGcxm">
+        <id property="id" column="id"/>
+        <result property="code" column="code"/>
+        <result property="proname" column="proname"/>
+        <result property="reportitemname" column="reportItemName"/>
+        <result property="proabbreviation" column="proabbreviation"/>
+        <result property="attribute" column="attribute"/>
+        <result property="property" column="property"/>
+        <result property="level" column="level"/>
+        <result property="constructionunit" column="constructionunit"/>
+        <result property="designunit" column="designunit"/>
+        <result property="planstartdate" column="planstartdate"/>
+        <result property="planenddate" column="planenddate"/>
+        <result property="startdate" column="startdate"/>
+        <result property="enddate" column="enddate"/>
+        <result property="quantities" column="quantities"/>
+        <result property="bid" column="bid"/>
+        <result property="provinceinvest" column="provinceinvest"/>
+        <result property="centreinvest" column="centreinvest"/>
+        <result property="estimate" column="estimate"/>
+        <result property="planno" column="planno"/>
+        <result property="branched" column="branched"/>
+        <result property="address" column="address"/>
+        <result property="structure" column="structure"/>
+        <result property="proinfo" column="proinfo"/>
+        <result property="sort" column="sort"/>
+        <result property="managesorgid" column="managesOrgId"/>
+        <result property="managesorgname" column="managesOrgName"/>
+        <result property="city" column="city"/>
+        <result property="startstation" column="startStation"/>
+        <result property="endstation" column="endStation"/>
+        <result property="xy" column="xy"/>
+        <result property="invmodel" column="invmodel"/>
+        <result property="mileage" column="mileage"/>
+        <result property="remark" column="remark"/>
+        <result property="introduce" column="introduce"/>
+        <result property="type" column="type"/>
+        <result property="legalperson" column="legalperson"/>
+        <result property="spanlength" column="spanlength"/>
+  </resultMap>
+</mapper>