部分代码提交

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/controller/LookOverController.java

@@ -1,5 +1,7 @@
 package com.jeeplus.test.garbageClearance.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.jeeplus.aop.logging.annotation.ApiLog;
 import com.jeeplus.notify.service.NotifyService;
@@ -10,6 +12,7 @@ import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.garbageClearance.domain.LookOver;
+import com.jeeplus.test.garbageClearance.service.DTO.LookOverDTO;
 import com.jeeplus.test.garbageClearance.service.LookOverService;
 import com.jeeplus.test.garbageClearance.utils.SnowFlake;
 import com.jeeplus.test.oss.domain.WorkAttachment;
@@ -147,4 +150,18 @@ public class LookOverController {
         return ResponseEntity.ok( userDTO );
     }
 
+    /**
+     * 查询未处理巡视单
+     * @param lookOver
+     * @param page
+     * @return
+     */
+    @ApiLog("查询未处理巡视单")
+    @GetMapping("getNotDisposeList")
+    public ResponseEntity<IPage<LookOver>> getNotDisposeList(LookOverDTO lookOver, Page<LookOverDTO> page) throws Exception {
+        IPage<LookOver> result = new Page<LookOver>();
+        result = overService.getNotDisposeList (page,lookOver);
+        return ResponseEntity.ok (result);
+    }
+
 }

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/domain/LookOver.java

@@ -37,6 +37,9 @@ public class LookOver extends BaseEntity implements Serializable {
     @ApiModelProperty("处理单位")
     private String processingUnit;
 
+    @ApiModelProperty("处理状态")
+    private String status;
+
     //附件信息
     @TableField(exist = false)
     List<WorkAttachmentInfo> fileList1;

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/mapper/LookOverMapper.java

@@ -1,8 +1,13 @@
 package com.jeeplus.test.garbageClearance.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.test.garbageClearance.domain.LookOver;
+import com.jeeplus.test.garbageClearance.service.DTO.LookOverDTO;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -15,5 +20,8 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface LookOverMapper extends BaseMapper<LookOver> {
 
+
+    IPage<LookOver> findPage(Page<LookOverDTO> page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper);
+
     UserDTO getUserInfoByOffId(@Param("officeId") String officeId);
 }

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/mapper/xml/LookOverMapper.xml

@@ -8,4 +8,23 @@
         left join sys_role sr on sur.role_id = sr.id
         where su.office_id = #{officeId} and sr.name = '村负责人'
     </select>
+
+    <select id="findPage" resultType="com.jeeplus.test.garbageClearance.domain.LookOver">
+        SELECT
+        a.id,
+        a.create_by_id,
+        a.create_time,
+        a.update_by_id,
+        a.update_time,
+        a.del_flag,
+        a.remarks,
+        a.no,
+        a.processing_unit,
+        a.`urls`,
+        a.`status`
+        FROM
+        garbage_clearance_look_over a
+        ${ew.customSqlSegment}
+        ORDER BY a.update_time DESC
+    </select>
 </mapper>

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/service/DTO/LookOverDTO.java

@@ -0,0 +1,29 @@
+package com.jeeplus.test.garbageClearance.service.DTO;
+
+import com.jeeplus.core.service.dto.BaseDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @author: 徐滕
+ * @version: 2024-08-30 16:20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class LookOverDTO extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    //备注
+    private String remarks;
+
+    //巡视工单
+    private String no;
+
+    //处理单位
+    private String processingUnit;
+
+    //处理状态
+    private String status;
+}

jeeplus-modules/jeeplus-test/src/main/java/com/jeeplus/test/garbageClearance/service/LookOverService.java

@@ -1,14 +1,32 @@
 package com.jeeplus.test.garbageClearance.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jeeplus.common.redis.RedisUtils;
+import com.jeeplus.core.query.QueryWrapperGenerator;
+import com.jeeplus.security.jwt.TokenProvider;
+import com.jeeplus.sys.constant.CacheNames;
+import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.garbageClearance.domain.LookOver;
 import com.jeeplus.test.garbageClearance.mapper.LookOverMapper;
+import com.jeeplus.test.garbageClearance.service.DTO.LookOverDTO;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @author 王强
  * @version 1.0
@@ -36,4 +54,30 @@ public class LookOverService extends ServiceImpl<LookOverMapper, LookOver> {
     public UserDTO getUserInfoByOffId(String officeId) {
         return baseMapper.getUserInfoByOffId(officeId);
     }
+
+
+    /**
+     * 查询无报告项目及老项目列表信息
+     * @param page
+     * @param lookOver
+     * @return
+     * @throws Exception
+     */
+    public IPage<LookOver> getNotDisposeList(Page<LookOverDTO> page, LookOverDTO lookOver) throws Exception{
+        UserDTO userDTO = UserUtils.getCurrentUserDTO();
+        QueryWrapper<LookOverDTO> queryWrapper = QueryWrapperGenerator.buildQueryCondition ( lookOver, LookOverDTO.class );
+        queryWrapper.eq("a.del_flag","0");
+        queryWrapper.eq("a.processing_unit",userDTO.getOfficeDTO().getId());
+        if(StringUtils.isNotBlank(lookOver.getStatus())){
+            queryWrapper.eq("a.status",lookOver.getStatus());
+        }
+        IPage<LookOver> pageList = baseMapper.findPage(page, queryWrapper);
+        for (LookOver record : pageList.getRecords()) {
+            if(StringUtils.isNotBlank(record.getNo())){
+                String no = "XS-J" + record.getNo();
+                record.setNo(no);
+            }
+        }
+        return pageList;
+    }
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/domain/Post.java

@@ -54,5 +54,10 @@ public class Post extends BaseEntity {
      */
     private String remarks;
 
+    /**
+     * 备注
+     */
+    private String tenantId;
+
 
 }

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/common/handler/ExtUserTaskActivityBehavior.java

@@ -115,6 +115,23 @@ public class ExtUserTaskActivityBehavior extends UserTaskActivityBehavior {
                         break;
                     case "custom":
                         //根据你的自定义标记，请自行实现
+                        //如果字符串中包含 "currentUserSql:" 则进行如下代码替换和处理
+                        if(flowAssignee.getValue ().contains("currentUserSql:")){
+                            //对应sql为：select su.* from sys_user_role a left join sys_role sr on sr.id = a.role_id left join sys_user su on su.id = a.user_id left join sys_office so on so.id = su.office_id where sr.en_name= 'bmzr' and so.id = (select office_id from sys_user where id = @currentUser.id)
+                            //用于查询当前登录人的部门主任人员信息
+                            UserDTO currentUserDTO = UserUtils.getCurrentUserDTO();
+                            String sql = flowAssignee.getValue ();
+                            if(sql.contains("@currentUser.id")){
+                                //将标志进行去除
+                                sql = sql.replaceAll("currentUserSql:","");
+                                //将判断条件进行替换
+                                sql = sql.replaceAll("@currentUser.id","'" + currentUserDTO.getId() + "'");
+                            }
+                            List<Map<String, Object>> maps = SpringUtil.getBean(JdbcTemplate.class).queryForList(sql);
+                            for (Map<String, Object> map : maps) {
+                                candidateUserIds.add(map.get ("id").toString ());
+                            }
+                        }
                         break;
                 }
             }

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/controller/FlowableTaskController.java

@@ -10,8 +10,10 @@ import com.jeeplus.common.utils.Collections3;
 import com.jeeplus.extension.domain.NodeSetting;
 import com.jeeplus.extension.service.NodeSettingService;
 import com.jeeplus.flowable.model.Flow;
+import com.jeeplus.flowable.model.FlowModel;
 import com.jeeplus.flowable.model.TaskComment;
 import com.jeeplus.flowable.service.FlowTaskService;
+import com.jeeplus.flowable.service.FlowableModelService;
 import com.jeeplus.flowable.vo.HisTaskVo;
 import com.jeeplus.flowable.vo.ProcessVo;
 import com.jeeplus.mail.domain.Mail;
@@ -75,6 +77,8 @@ public class FlowableTaskController {
 
     @Autowired
     private MailService mailService;
+    @Autowired
+    private FlowableModelService flowableModelService;
 
 
     @GetMapping("todo")
@@ -378,4 +382,13 @@ public class FlowableTaskController {
     }
 
 
+    /**
+     * 根据用户角色名称查询流程id
+     */
+    @GetMapping("getProcessDefIdByRoleName")
+    public ResponseEntity getProcessDefIdByRoleName(Page <FlowModel> page, String filter, HttpServletRequest request) {
+        page = flowableModelService.getModels ( page, filter, "modifiedDesc", 0, request );
+        return ResponseEntity.ok ( page );
+    }
+
 }