feats

db/.back_文明创办/文明创办-backup-20221215110455.pdma.json → db/.back_文明创办/文明创办-backup-20221216093029.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-15 11:04:32",
+  "updatedTime": "2022-12-15 16:32:54",
   "dbConns": [],
   "profile": {
     "default": {
@@ -2408,7 +2408,7 @@
           "id": "31357233-866E-45C4-867D-1F11AD8CF851"
         },
         {
-          "defKey": "resource_p_id",
+          "defKey": "parent_id",
           "defName": "上级ID",
           "comment": "",
           "type": "",

db/文明创办.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.1.4",
   "createdTime": "2022-12-12 09:36:12",
-  "updatedTime": "2022-12-15 16:32:54",
+  "updatedTime": "2022-12-16 09:30:29",
   "dbConns": [],
   "profile": {
     "default": {
@@ -4646,7 +4646,24 @@
           "id": "0EF50BA7-C44F-4D9E-A28D-F94C3D15350F"
         },
         {
-          "defKey": "expire_date",
+          "defKey": "start_date",
+          "defName": "开始日期",
+          "comment": "YYYY-MM-DD",
+          "type": "VARCHAR",
+          "len": 20,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "79224057-EA94-4244-B887-4A046ACE7B35"
+        },
+        {
+          "defKey": "end_date",
           "defName": "截止时间",
           "comment": "YYYY-MM-DD",
           "type": "VARCHAR",

src/main/java/com/example/civilizedcity/controller/TaCheckController.java

@@ -13,7 +13,7 @@ import com.example.civilizedcity.entity.TaCheck;
 import com.example.civilizedcity.service.TaCheckService;
 
  /**
- * 模拟测评;(ta_mock_check)表控制层
+ * 模拟测评;(ta_check)表控制层
  * @author : http://njyunzhi.com
  * @date : 2022-12-12
  */
@@ -23,7 +23,7 @@ import com.example.civilizedcity.service.TaCheckService;
 public class TaCheckController extends BaseController {
     
     @Autowired
-    private TaCheckService taMockCheckService;
+    private TaCheckService taCheckService;
     
     /** 
      * 通过ID查询单条数据 
@@ -32,9 +32,9 @@ public class TaCheckController extends BaseController {
      * @return 实例对象
      */
     @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/taMockCheck/{id}")
+    @GetMapping("/taCheck/{id}")
     public ResponseBean queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return ResponseBean.success(taMockCheckService.getById(id));
+        return ResponseBean.success(taCheckService.getById(id));
     }
     
     /** 
@@ -45,14 +45,14 @@ public class TaCheckController extends BaseController {
      * @return 查询结果
      */
     @ApiOperation("分页查询")
-    @GetMapping("/taMockCheck")
+    @GetMapping("/taCheck")
     public ResponseBean list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
         
         IPage<TaCheck> pg = new Page<>(pageNum, pageSize);
-        // QueryWrapper<TaMockCheck> queryWrapper = new QueryWrapper<>();
+        // QueryWrapper<taCheck> queryWrapper = new QueryWrapper<>();
         // queryWrapper.orderByDesc("create_date");
-        IPage<TaCheck> result = taMockCheckService.page(pg);
+        IPage<TaCheck> result = taCheckService.page(pg);
         
         return ResponseBean.success(result);
     }
@@ -60,28 +60,28 @@ public class TaCheckController extends BaseController {
     /** 
      * 新增数据
      *
-     * @param taMockCheck 实例对象
+     * @param taCheck 实例对象
      * @return 实例对象
      */
     @ApiOperation("新增数据")
-    @PostMapping("/taMockCheck")
-    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheck taMockCheck) throws Exception {
-        taMockCheckService.save(taMockCheck);
-        return ResponseBean.success(taMockCheck);
+    @PostMapping("/taCheck")
+    public ResponseBean add(@ApiParam("对象实体") @RequestBody TaCheck taCheck) throws Exception {
+        taCheckService.save(taCheck);
+        return ResponseBean.success(taCheck);
     }
     
     /** 
      * 更新数据
      *
-     * @param taMockCheck 实例对象
+     * @param taCheck 实例对象
      * @return 实例对象
      */
     @ApiOperation("更新数据")
-    @PutMapping("/taMockCheck/{id}")
-    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheck taMockCheck,
+    @PutMapping("/taCheck/{id}")
+    public ResponseBean edit(@ApiParam("对象实体") @RequestBody TaCheck taCheck,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        taMockCheckService.updateById(taMockCheck);
-        return ResponseBean.success(taMockCheck);
+        taCheckService.updateById(taCheck);
+        return ResponseBean.success(taCheck);
     }
     
     /** 
@@ -91,9 +91,9 @@ public class TaCheckController extends BaseController {
      * @return 是否成功
      */
     @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/taMockCheck/{id}")
+    @DeleteMapping("/taCheck/{id}")
     public ResponseBean deleteById(@ApiParam("对象ID") @PathVariable String id){
-        taMockCheckService.removeLogicById(id);
+        taCheckService.removeLogicById(id);
         return ResponseBean.success("success");
     }
 }

src/main/java/com/example/civilizedcity/entity/TaCheck.java

@@ -23,27 +23,30 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "模拟测评",description = "")
 @TableName("ta_check")
 public class TaCheck implements Serializable,Cloneable{
-     /** 测评ID */
-     @ApiModelProperty(name = "测评ID",notes = "")
-     @TableId(value = "check_id", type = IdType.INPUT)
-     private String checkId ;
-     /** 测评标题 */
-     @ApiModelProperty(name = "测评标题",notes = "")
-     private String title ;
-     /** 总分 */
-     @ApiModelProperty(name = "总分",notes = "")
-     private Integer score ;
-     /** 机构ID */
-     @ApiModelProperty(name = "机构ID",notes = "")
-     private String orgId ;
-     /** 状态 */
-     @ApiModelProperty(name = "状态",notes = "")
-     private Integer status ;
-     /** 创建人 */
-     @ApiModelProperty(name = "创建人",notes = "")
-     private String createUser ;
-     /** 创建时间 */
-     @ApiModelProperty(name = "创建时间",notes = "")
-     private LocalDateTime createDate ;
+      /** 测评ID */
+      @ApiModelProperty(name = "测评ID",notes = "")
+      @TableId(value = "check_id", type = IdType.ASSIGN_UUID)
+      private String checkId ;
+      /** 测评标题 */
+      @ApiModelProperty(name = "测评标题",notes = "")
+      private String title ;
+      /** 总分 */
+      @ApiModelProperty(name = "总分",notes = "")
+      private Integer score ;
+      /** 开始日期;YYYY-MM-DD */
+      @ApiModelProperty(name = "开始日期",notes = "YYYY-MM-DD")
+      private String startDate ;
+      /** 截止时间;YYYY-MM-DD */
+      @ApiModelProperty(name = "截止时间",notes = "YYYY-MM-DD")
+      private String endDate ;
+      /** 状态 */
+      @ApiModelProperty(name = "状态",notes = "")
+      private Integer status ;
+      /** 创建人 */
+      @ApiModelProperty(name = "创建人",notes = "")
+      private String createUser ;
+      /** 创建时间 */
+      @ApiModelProperty(name = "创建时间",notes = "")
+      private LocalDateTime createDate ;
 
 }

src/main/java/com/example/civilizedcity/entity/TdLocType.java

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -31,6 +32,7 @@ public class TdLocType implements Serializable,Cloneable{
     @ApiModelProperty(name = "分类名称",notes = "")
     private String name ;
     /** 分类描述 */
+    @TableField("`desc`")
     @ApiModelProperty(name = "分类描述",notes = "")
     private String desc ;
     /** 排序 */

src/main/java/com/example/civilizedcity/service/impl/SysPositionServiceImpl.java

@@ -22,7 +22,7 @@ public class SysPositionServiceImpl extends BaseServiceImpl<SysPositionMapper, S
         QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", orgId);
         queryWrapper.eq("name", name);
-        queryWrapper.ne(StringUtils.isEmpty(nePosId), "position_id", nePosId);
+        queryWrapper.ne(!StringUtils.isEmpty(nePosId), "position_id", nePosId);
 
         return count(queryWrapper);
     }