瀏覽代碼

添加代码系统表

cxd 7 月之前
父節點
當前提交
20810dda83

+ 6 - 6
gqy-admin/src/main/java/com/gqy/web/controller/document/WorkController.java → gqy-admin/src/main/java/com/gqy/web/controller/document/DcWorkController.java

@@ -4,7 +4,7 @@ package com.gqy.web.controller.document;
 import com.gqy.common.core.controller.BaseController;
 import com.gqy.common.core.domain.AjaxResult;
 import com.gqy.common.core.page.TableDataInfo;
-import com.gqy.document.domain.Work;
+import com.gqy.document.domain.DcWork;
 import com.gqy.document.service.IWorkService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -14,7 +14,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/work")
-public class WorkController extends BaseController {
+public class DcWorkController extends BaseController {
 
     @Autowired
     private IWorkService iWorkService;
@@ -28,11 +28,11 @@ public class WorkController extends BaseController {
      */
     //@PostMapping("/list")
     @GetMapping("/list")
-    public  TableDataInfo list(Work work) {
+    public  TableDataInfo list(DcWork work) {
         // 开启分页
         startPage();
         // 获取工程列表
-        List<Work> list = iWorkService.selectWorkList(work);
+        List<DcWork> list = iWorkService.selectWorkList(work);
         // 返回分页数据
         return getDataTable(list);
     }
@@ -45,7 +45,7 @@ public class WorkController extends BaseController {
      * @return 结果
      */
     @PostMapping(value = "/add")
-    public AjaxResult add(@Validated @RequestBody Work work) {
+    public AjaxResult add(@Validated @RequestBody DcWork work) {
         return toAjax(iWorkService.insertWork(work));
     }
 
@@ -57,7 +57,7 @@ public class WorkController extends BaseController {
      * @return 结果
      */
     @PostMapping(value = "/edit")
-    public AjaxResult edit(@Validated @RequestBody Work work) {
+    public AjaxResult edit(@Validated @RequestBody DcWork work) {
         return toAjax(iWorkService.updateWork(work));
     }
 

+ 2 - 8
gqy-system/src/main/java/com/gqy/document/domain/Work.java → gqy-system/src/main/java/com/gqy/document/domain/DcWork.java

@@ -7,7 +7,7 @@ import com.gqy.common.annotation.Excel;
 /**
  * 工程类别表
  */
-public class Work {
+public class DcWork {
 
     private Long wkId;
 
@@ -82,11 +82,5 @@ public class Work {
         this.wkProductCount = wkProductCount;
     }
 
-    public static void main(String[] args) {
-        Work work = new Work();
-        work.setWkName("朱敏测试工程");
-        work.setWkNo("TESTZM07");
-        work.setWkRemark("朱敏测试remark");
-        System.out.println(JSON.toJSONString(work));
-    }
+
 }

+ 7 - 6
gqy-system/src/main/java/com/gqy/document/mapper/WorkMapper.java

@@ -1,6 +1,7 @@
 package com.gqy.document.mapper;
 
-import com.gqy.document.domain.Work;
+import com.gqy.document.domain.DcWork;
+
 import java.util.List;
 /**
  * 工程Mapper接口
@@ -9,17 +10,17 @@ public interface WorkMapper {
     /**
      * 查询工程列表
      */
-    public List<Work> selectWorkList(Work work);
+    public List<DcWork> selectWorkList(DcWork work);
 
     /**
      * 新增工程
      */
-    public int insertWork(Work work);
+    public int insertWork(DcWork work);
 
     /**
      * 修改工程
      */
-    public int updateWork(Work work);
+    public int updateWork(DcWork work);
 
     /**
      * 查询工程详细信息
@@ -27,5 +28,5 @@ public interface WorkMapper {
      * @param wkId 工程主键
      * @return 工程信息
      */
-    public Work selectWorkById(Long wkId);
-}
+    public DcWork selectWorkById(Long wkId);
+}

+ 5 - 5
gqy-system/src/main/java/com/gqy/document/service/IWorkService.java

@@ -1,6 +1,6 @@
 package com.gqy.document.service;
 
-import com.gqy.document.domain.Work;
+import com.gqy.document.domain.DcWork;
 
 import java.util.List;
 
@@ -16,7 +16,7 @@ public interface IWorkService {
      * @param work 工程信息
      * @return 工程集合
      */
-    public List<Work> selectWorkList(Work work);
+    public List<DcWork> selectWorkList(DcWork work);
 
     /**
      * 查询工程详细信息
@@ -24,7 +24,7 @@ public interface IWorkService {
      * @param wkId 工程主键
      * @return 工程信息
      */
-    public Work selectWorkById(Long wkId);
+    public DcWork selectWorkById(Long wkId);
 
     /**
      * 新增工程
@@ -32,7 +32,7 @@ public interface IWorkService {
      * @param work 工程信息
      * @return 结果
      */
-    public int insertWork(Work work);
+    public int insertWork(DcWork work);
 
     /**
      * 修改工程
@@ -40,7 +40,7 @@ public interface IWorkService {
      * @param work 工程信息
      * @return 结果
      */
-    public int updateWork(Work work);
+    public int updateWork(DcWork work);
 
     /**
      * 删除工程

+ 7 - 11
gqy-system/src/main/java/com/gqy/document/service/impl/WorkServiceImpl.java

@@ -2,7 +2,7 @@ package com.gqy.document.service.impl;
 
 import com.gqy.common.enums.UserStatus;
 import com.gqy.common.utils.DateUtils;
-import com.gqy.document.domain.Work;
+import com.gqy.document.domain.DcWork;
 import com.gqy.document.mapper.WorkMapper;
 import com.gqy.document.service.IWorkService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,8 +22,7 @@ public class WorkServiceImpl implements IWorkService {
      * @param work 工程信息查询条件
      * @return 工程信息集合
      */
-    @Override
-    public List<Work> selectWorkList(Work work) {
+    public List<DcWork> selectWorkList(DcWork work) {
         return workMapper.selectWorkList(work);
     }
 
@@ -33,8 +32,7 @@ public class WorkServiceImpl implements IWorkService {
      * @param wkId 工程主键
      * @return 工程信息
      */
-    @Override
-    public Work selectWorkById(Long wkId) {
+    public DcWork selectWorkById(Long wkId) {
         return workMapper.selectWorkById(wkId);
     }
 
@@ -44,8 +42,8 @@ public class WorkServiceImpl implements IWorkService {
      * @param work 工程信息
      * @return 结果
      */
-    @Override
-    public int insertWork(Work work) {
+
+    public int insertWork(DcWork work) {
         // 如果状态为空,设置默认值为0(显示)
         if (work.getWkStaus() == null) {
             work.setWkStaus(0);
@@ -68,8 +66,7 @@ public class WorkServiceImpl implements IWorkService {
      * @param work 工程信息
      * @return 结果
      */
-    @Override
-    public int updateWork(Work work) {
+    public int updateWork(DcWork work) {
         // 设置更新时间
         //work.setUpdateTime(DateUtils.getNowDate());
 
@@ -81,9 +78,8 @@ public class WorkServiceImpl implements IWorkService {
      * @param id
      * @return
      */
-    @Override
     public int deleWork(Long id) {
-        Work work = workMapper.selectWorkById(id);
+        DcWork work = workMapper.selectWorkById(id);
         if(work != null){
             work.setWkStaus(Integer.valueOf(UserStatus.DELETED.getCode()));
         }

+ 4 - 4
gqy-system/src/main/resources/mapper/document/WorkMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.gqy.document.mapper.WorkMapper">
 
-    <resultMap type="Work" id="WorkResult">
+    <resultMap type="DcWork" id="WorkResult">
         <id     property="wkId"           column="wk_id"           />
         <result property="wkNo"           column="wk_no"           />
         <result property="wkName"         column="wk_name"         />
@@ -16,7 +16,7 @@
         from dc_work
     </sql>
 
-    <select id="selectWorkList" parameterType="Work" resultMap="WorkResult">
+    <select id="selectWorkList" parameterType="DcWork" resultMap="WorkResult">
         <include refid="selectWorkVo"/>
         <where>
             <if test="wkNo != null and wkNo != ''">
@@ -36,7 +36,7 @@
         where wk_id = #{wkId}
     </select>
 
-    <insert id="insertWork" parameterType="Work" useGeneratedKeys="true" keyProperty="wkId">
+    <insert id="insertWork" parameterType="DcWork" useGeneratedKeys="true" keyProperty="wkId">
         insert into dc_work (
             wk_no, wk_name, wk_remark, wk_staus
         ) values (
@@ -44,7 +44,7 @@
                  )
     </insert>
 
-    <update id="updateWork" parameterType="Work">
+    <update id="updateWork" parameterType="DcWork">
         update dc_work
         <set>
             <if test="wkNo != null">wk_no = #{wkNo},</if>

+ 13 - 0
创建表语句.txt

@@ -328,3 +328,16 @@ CREATE TABLE `dc_param` (
   `psp_dck_id` int DEFAULT NULL COMMENT '文档块id',
   PRIMARY KEY (`psp_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='产品参数表';
+
+
+CREATE TABLE `dc_work` (
+  `wk_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '工程主键',
+  `wk_no` varchar(50) NOT NULL COMMENT '工程编码',
+  `wk_name` varchar(100) NOT NULL COMMENT '工程名称',
+  `wk_remark` varchar(500) DEFAULT NULL COMMENT '工程备注',
+  `wk_staus` tinyint(1) DEFAULT '1' COMMENT '状态(1不显示 0显示)',
+  `wk_product_count` int(11) DEFAULT '0' COMMENT '产品数',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  PRIMARY KEY (`wk_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COMMENT='工程表';