导入审批流

src/main/java/com/qdport/controller/PolicyMessageController.java

@@ -1,5 +1,6 @@
 package com.qdport.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qdport.entity.PolicyMessage;
 import com.qdport.service.PolicyMessageService;
 import com.qdport.query.PolicyMessageQuery;
@@ -38,6 +39,13 @@ public class PolicyMessageController extends QdportController {
     @ApiOperation(value = "分页", notes = "分页")
     public R<IPage<PolicyMessageVO>> page(@Valid PolicyMessageQuery query) {
         IPage<PolicyMessageVO> page = policyMessageService.page(query);
+        List<PolicyMessageVO> records = page.getRecords();
+        for (PolicyMessageVO model : records) {
+            QueryWrapper<PolicyMessage> messageWrapper = new QueryWrapper<>();
+            messageWrapper.eq("PARENT_ID", model.getId());
+            long count = policyMessageService.count(messageWrapper);
+            model.setChildrenCount(count);
+        }
         return R.data(page);
     }
 

src/main/java/com/qdport/controller/PolicyProgressController.java

@@ -5,17 +5,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qdport.core.boot.ctrl.QdportController;
 import com.qdport.core.tool.api.R;
+import com.qdport.entity.PolicyCondition;
 import com.qdport.entity.PolicyShare;
 import com.qdport.modules.system.entity.SysDept;
 import com.qdport.modules.system.service.SysDeptService;
 import com.qdport.query.PolicyProgressQuery;
 import com.qdport.query.QueryWrapperBuilder;
+import com.qdport.service.PolicyConditionService;
 import com.qdport.service.PolicyShareService;
 import com.qdport.service.PolicyStriveService;
 import com.qdport.util.StringUtil;
 import com.qdport.vo.PolicyProgressVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,27 +37,43 @@ public class PolicyProgressController extends QdportController {
     @Resource
     private PolicyStriveService policyStriveService;
     @Resource
+    private PolicyConditionService policyConditionService;
+    @Resource
     private SysDeptService sysDeptService;
 
     @GetMapping("sharePage")
     @ApiOperation(value = "分页", notes = "分页")
     public R<IPage> page(@Valid PolicyProgressQuery query) {
-        IPage<SysDept> page = new Page<>(query.getPage(), query.getSize());
+        IPage<SysDept> deptPage = new Page<>(query.getPage(), query.getSize());
         QueryWrapper<SysDept> wrapper = QueryWrapperBuilder.buildQueryWrapper(query, SysDept.class);
         if (StringUtil.isEmpty(query.getBeginCreateTime()) || StringUtil.isEmpty(query.getEndCreateTime())) {
             throw new RuntimeException("参数错误");
         }
 
-        page = sysDeptService.page(page, wrapper);
-        List<SysDept> records = page.getRecords();
+        deptPage = sysDeptService.page(deptPage, wrapper);
+        List<SysDept> records = deptPage.getRecords();
 
+        IPage<PolicyProgressVo> page = new Page<>(query.getPage(), query.getSize());
+        page.setTotal(deptPage.getTotal());
         List<PolicyProgressVo> progressVoList = new ArrayList<>();
         for (SysDept model : records) {
+            PolicyProgressVo vo = new PolicyProgressVo();
+            BeanUtils.copyProperties(model, vo);
+
             QueryWrapper<PolicyShare> policyShareWrapper = new QueryWrapper<>();
             policyShareWrapper.eq("COMPANY_ID", model.getId());
             policyShareWrapper.lt("CREATE_TIME", query.getEndCreateTime());
             policyShareWrapper.gt("CREATE_TIME", query.getBeginCreateTime());
-            policyShareService.getOne(policyShareWrapper);
+            long count = policyShareService.count(policyShareWrapper);
+            vo.setCount(count);
+
+//            if (count == 1) {
+//                PolicyShare shareOne = policyShareService.getOne(policyShareWrapper);
+//
+//            }
+
+
+            progressVoList.add(vo);
         }
         return null;
     }

src/main/java/com/qdport/controller/PolicyTodoController.java

@@ -25,11 +25,11 @@ import java.util.List;
 import java.util.Map;
 
 /**
-* 政策待办
-*
-* @author yuheng 
-* @since 1.0.0 2024-10-11
-*/
+ * 政策待办
+ *
+ * @author yuheng
+ * @since 1.0.0 2024-10-11
+ */
 @RestController
 @RequestMapping("qdport-zcgx/todo")
 @Api(value = "政策待办", tags = "政策待办")
@@ -42,11 +42,11 @@ public class PolicyTodoController extends QdportController {
     private PolicySystemService policySystemService;
 
     /**
-    * 分页
-    */
+     * 分页
+     */
     @GetMapping("page")
     @ApiOperation(value = "分页", notes = "分页")
-    public R<IPage<PolicyTodoVO>> page(@Valid PolicyTodoQuery query){
+    public R<IPage<PolicyTodoVO>> page(@Valid PolicyTodoQuery query) {
         IPage<PolicyTodoVO> page = policyTodoService.page(query);
         List<PolicyTodoVO> records = page.getRecords();
         for (PolicyTodoVO model : records) {
@@ -59,41 +59,41 @@ public class PolicyTodoController extends QdportController {
     }
 
     /**
-    * 详情
-    */
+     * 详情
+     */
     @GetMapping("{id}")
     @ApiOperation(value = "详情", notes = "id")
-    public R<PolicyTodoVO> get(@PathVariable("id") String id){
+    public R<PolicyTodoVO> get(@PathVariable("id") String id) {
         PolicyTodo entity = policyTodoService.getById(id);
         return R.data(PolicyTodoWrapper.build().entityVO(entity));
     }
 
     /**
-    * 新增
-    */
+     * 新增
+     */
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "传入PolicyTodo")
-    public R save(@RequestBody PolicyTodoVO vo){
+    public R save(@RequestBody PolicyTodoVO vo) {
         policyTodoService.save(vo);
         return R.success("保存成功");
     }
 
     /**
-    * 修改
-    */
+     * 修改
+     */
     @PostMapping("/update")
-    public R update(@RequestBody @Valid PolicyTodoVO vo){
+    public R update(@RequestBody @Valid PolicyTodoVO vo) {
         policyTodoService.update(vo);
         return R.success("更新成功");
     }
 
     /**
-    * 删除
-    */
+     * 删除
+     */
     @PostMapping("/remove")
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
-    public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids){
-         List<String> idList = Func.toStrList(ids);
+    public R delete(@ApiParam(value = "主键集合", required = true) @RequestParam(name = "ids") String ids) {
+        List<String> idList = Func.toStrList(ids);
         policyTodoService.delete(idList);
         return R.success("删除成功");
     }

src/main/java/com/qdport/query/PolicyMessageQuery.java

@@ -1,4 +1,5 @@
 package com.qdport.query;
+import com.qdport.annotation.Wrapper;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,4 +19,15 @@ public class PolicyMessageQuery implements Serializable {
     private Integer page=1;
     @ApiModelProperty("分页参数页码大小")
     private Integer size=20;
+
+    @Wrapper
+    private String refType;
+    @Wrapper
+    private String refId;
+    @Wrapper
+    private Long createId;
+    @Wrapper
+    private Long replyId;
+    @Wrapper
+    private String parentId;
 }

src/main/java/com/qdport/service/impl/PolicyConditionServiceImpl.java

@@ -26,7 +26,6 @@ import java.util.List;
  * @since 1.0.0 2024-10-28
  */
 @Service
-@AllArgsConstructor
 public class PolicyConditionServiceImpl extends ServiceImpl<PolicyConditionMapper, PolicyCondition> implements PolicyConditionService {
 
     @Override

src/main/java/com/qdport/service/impl/PolicyLogServiceImpl.java

@@ -25,7 +25,6 @@ import java.util.List;
  * @since 1.0.0 2024-10-28
  */
 @Service
-@AllArgsConstructor
 public class PolicyLogServiceImpl extends ServiceImpl<PolicyLogMapper, PolicyLog> implements PolicyLogService {
 
     @Override

src/main/java/com/qdport/service/impl/PolicyMessageServiceImpl.java

@@ -1,18 +1,15 @@
 package com.qdport.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.AllArgsConstructor;
+import com.qdport.query.QueryWrapperBuilder;
 import com.qdport.entity.PolicyMessage;
 import com.qdport.query.PolicyMessageQuery;
 import com.qdport.vo.PolicyMessageVO;
 import com.qdport.mapper.PolicyMessageMapper;
 import com.qdport.service.PolicyMessageService;
 import com.qdport.wrapper.PolicyMessageWrapper;
-import com.qdport.core.tool.utils.Func;
 import com.qdport.core.tool.utils.BeanUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -28,7 +25,6 @@ import java.util.List;
  * @since 1.0.0 2024-10-28
  */
 @Service
-@AllArgsConstructor
 public class PolicyMessageServiceImpl extends ServiceImpl<PolicyMessageMapper, PolicyMessage> implements PolicyMessageService {
 
     @Override
@@ -38,15 +34,16 @@ public class PolicyMessageServiceImpl extends ServiceImpl<PolicyMessageMapper, P
         return PolicyMessageWrapper.build().pageVO(page);
     }
 
-    private LambdaQueryWrapper<PolicyMessage> getWrapper(PolicyMessageQuery query) {
-        LambdaQueryWrapper<PolicyMessage> wrapper = Wrappers.lambdaQuery();
+    private QueryWrapper<PolicyMessage> getWrapper(PolicyMessageQuery query) {
+        QueryWrapper<PolicyMessage> wrapper = QueryWrapperBuilder.buildQueryWrapper(query, PolicyMessage.class);
+        wrapper.orderByDesc("CREATE_TIME");
         return wrapper;
     }
 
     @Override
     public void save(PolicyMessageVO vo) {
         PolicyMessage entity = BeanUtil.copy(vo, PolicyMessage.class);
-        vo.setCreateTime(new Date());
+        entity.setCreateTime(new Date());
         baseMapper.insert(entity);
     }
 
@@ -64,7 +61,11 @@ public class PolicyMessageServiceImpl extends ServiceImpl<PolicyMessageMapper, P
             PolicyMessage message = baseMapper.selectById(id);
             removeById(message);
 
-            removeMessage(message);
+            QueryWrapper<PolicyMessage> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("PARENT_ID", message.getId());
+            queryWrapper.eq("REF_TYPE", message.getRefType());
+            queryWrapper.eq("REF_ID", message.getRefId());
+            baseMapper.delete(queryWrapper);
         }
     }
 
@@ -83,6 +84,5 @@ public class PolicyMessageServiceImpl extends ServiceImpl<PolicyMessageMapper, P
                 }
             }
         }
-
     }
 }

src/main/java/com/qdport/vo/PolicyMessageVO.java

@@ -13,5 +13,5 @@ import com.qdport.entity.PolicyMessage;
 public class PolicyMessageVO extends PolicyMessage {
 	private static final long serialVersionUID = 1L;
 
-
+	private Long childrenCount;
 }

src/main/java/com/qdport/vo/PolicyProgressVo.java

@@ -1,11 +1,28 @@
 package com.qdport.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.qdport.entity.PolicyShare;
+import com.qdport.modules.system.entity.SysDept;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
-public class PolicyProgressVo extends PolicyShare {
+public class PolicyProgressVo extends SysDept {
+
+    private Long count;
 
+    @DateTimeFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @JsonFormat(
+            pattern = "yyyy-MM-dd"
+    )
+    @ApiModelProperty(value = "应填报日期")
+    private Date ytbDate;
 }

src/main/resources/logback-dev.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_HOME" value="/usr/local/chengfa/logs" />
+    <property name="LOG_HOME" value="/home/qdg/logs" />
     <!-- 控制台输出 -->
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
@@ -9,6 +9,26 @@
             <pattern>===%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) Line:%-3L - %gray(%msg%n)</pattern>
         </encoder>
     </appender>
+
+    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/easydo-qdg-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>===%red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36})
+                Line:%-3L - %msg%n
+            </pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <!--<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+        <!--<MaxFileSize>10MB</MaxFileSize>-->
+        <!--</triggeringPolicy>-->
+    </appender>
     <!-- 日志输出级别 -->
     <root level="INFO">
         <appender-ref ref="STDOUT" />