合同借用定时任务功能开发

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/domain/CwWorkContractBorrowMessage.java

@@ -32,4 +32,11 @@ public class CwWorkContractBorrowMessage extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date retData;
 
+    private String contractId;  //合同id
+
+    private String contractCreateById;  //合同创建人id
+
+    private String processDefinitionId;  //流程defId
+    private String procInsId;  //流程procInsId
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/CwWorkContractBorrowMapper.java

@@ -26,4 +26,11 @@ public interface CwWorkContractBorrowMapper extends BaseMapper<CwWorkContractBor
     List<CwWorkContractBorrowMessage> findMessageList(@Param("id") String id);
 
     CwWorkContractBorrow selectByInfoId(String id);
+
+    /**
+     * 查询临期合同借用信息
+     * @param adventDay
+     * @return
+     */
+    List<CwWorkContractBorrowMessage> getAdventMessageList(@Param("adventDay") String adventDay);
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/mapper/xml/CwWorkContractBorrowMapper.xml

@@ -46,4 +46,32 @@
             resultType="com.jeeplus.test.cw.contractRegistration.domain.CwWorkContractBorrow">
         select * from cw_work_contract_borrow where contract_info_id = #{id}
     </select>
+
+
+    <select id="getAdventMessageList" resultType="com.jeeplus.test.cw.contractRegistration.domain.CwWorkContractBorrowMessage">
+        SELECT
+			a.id,
+			a.create_by,
+			wci.create_by as "contractCreateById",
+			wcb.contract_info_id as "contractId",
+			wcb.proc_ins_id as "procInsId",
+			wcb.process_definition_id as "processDefinitionId",
+			a.create_date,
+			a.update_by,
+			a.update_date,
+			a.del_flag,
+			a.contract_borrow_id,
+			a.contract_name,
+			a.borrow_name,
+			DATE_FORMAT(a.borrow_data,'%Y-%m-%d') as borrow_data,
+			DATE_FORMAT(a.borrow_ret_data,'%Y-%m-%d') as borrow_ret_data,
+			a.borrow_type,
+			DATE_FORMAT( a.ret_data, '%Y-%m-%d' ) AS ret_data
+		 FROM cw_work_contract_borrow_message a
+		 left join cw_work_contract_borrow wcb on wcb.id = a.contract_borrow_id
+		 left join cw_work_contract_info wci on wci.id = wcb.contract_info_id
+		 WHERE a.del_flag = 0 and a.ret_data is null
+			and now() > date_add(a.borrow_ret_data,interval #{adventDay} day)
+		 order by a.create_date desc
+    </select>
 </mapper>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/contractRegistration/service/CwWorkContractBorrowService.java

@@ -1,7 +1,11 @@
 package com.jeeplus.test.cw.contractRegistration.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jeeplus.flowable.model.MyNoticeList;
+import com.jeeplus.flowable.service.FlowTaskService;
+import com.jeeplus.flowable.service.MyNoticeService;
 import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.utils.DictUtils;
 import com.jeeplus.sys.utils.StringUtils;
 import com.jeeplus.sys.utils.UserUtils;
 import com.jeeplus.test.cw.contractRegistration.domain.CwWorkContractBorrow;
@@ -10,14 +14,15 @@ import com.jeeplus.test.cw.contractRegistration.mapper.ContractInfoMapper;
 import com.jeeplus.test.cw.contractRegistration.mapper.CwWorkContractBorrowMapper;
 import com.jeeplus.test.cw.contractRegistration.mapper.CwWorkContractBorrowMessageMapper;
 import com.jeeplus.test.cw.contractRegistration.service.dto.CwWorkContractBorrowDto;
+import org.flowable.bpmn.model.FlowNode;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.UUID;
-import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 /**
  * @author: 王强
  * @create: 2022-11-27 13:51
@@ -34,6 +39,12 @@ public class CwWorkContractBorrowService {
     @Resource
     private ContractInfoMapper infoMapper;
 
+    @Resource
+    private MyNoticeService myNoticeService;
+
+    @Resource
+    private FlowTaskService flowTaskService;
+
     public String saveInfo(CwWorkContractBorrowDto workContractBorrowDto) throws Exception {
         if (StringUtils.isNotEmpty(workContractBorrowDto.getId())) {
             CwWorkContractBorrow info = borrowMapper.selectById( workContractBorrowDto.getId());
@@ -163,4 +174,125 @@ public class CwWorkContractBorrowService {
         }
         return null;
     }
+
+    /**
+     * 查询临期合同借用信息
+     * @return
+     */
+    public List<CwWorkContractBorrowMessage> getAdventMessageList() {
+        String adventDay = DictUtils.getDictLabel("advent_day", "cw_borrow_advent", "");
+        adventDay = "-" + adventDay;
+        List<CwWorkContractBorrowMessage> adventMessageList = borrowMapper.getAdventMessageList(adventDay);
+        if(null != adventMessageList && adventMessageList.size()>0){
+            for (CwWorkContractBorrowMessage info : adventMessageList) {
+                String taskName = null;
+                String titleStr = null;
+
+                //如果当前时间大于过期时间
+                //Date类的一个方法，如果info.getAdventDateDate()早于 new Date() 返回true，否则返回false
+                if(info.getBorrowRetData().before(new Date())){
+                    taskName = "合同【"+ info.getContractName()+"】借用已超期";
+                    titleStr = "合同【"+ info.getContractName()+"】借用已超期。超期时间："+dateToString(info.getBorrowRetData()) +"。";
+                }else{
+                    taskName = "合同【"+ info.getContractName()+"】即将借用超期";
+                    titleStr = "合同【"+ info.getContractName()+"】即将借用超期。超期时间："+dateToString(info.getBorrowRetData());
+                }
+
+
+                //计算两日期之间的天数
+                Integer interval = Integer.valueOf(this.getInterval(info.getBorrowRetData(), new Date()));
+                if(interval > 0){
+                    titleStr = titleStr + "已超期：" + interval + "天。请尽快归还";
+                }
+
+                Set<String> noticeUserSet = new HashSet<String>();
+                if(StringUtils.isNotBlank(info.getBorrowName())){
+                    UserDTO borrowUser = UserUtils.getByName(info.getBorrowName());
+                    if(null != borrowUser && StringUtils.isNotBlank(borrowUser.getId())){
+                        noticeUserSet.add(borrowUser.getId());
+                    }
+                }
+                if(StringUtils.isNotBlank(info.getContractCreateById())){
+                    noticeUserSet.add(info.getContractCreateById());
+                }
+                List<String> noticeUserList = new ArrayList<String>(noticeUserSet);
+                if(noticeUserList.size()>0){
+                    MyNoticeList myNotice = new MyNoticeList();
+                    myNotice.setCreateBy("1");
+                    myNotice.setCreateDate(new Date());
+                    myNotice.setUpdateBy("1");
+                    myNotice.setUpdateDate(new Date());
+                    myNotice.setDelFlag(0);
+                    //根据procInsId获取taskId
+                    String currentTask = flowTaskService.getTaskIdByprocInstId(info.getProcInsId());
+                    myNotice.setTaskId(currentTask);
+                    myNotice.setDefId(info.getProcessDefinitionId());
+                    myNotice.setTitle(titleStr);
+                    myNotice.setTaskName(taskName);
+                    myNotice.setLink("结束");
+                    myNotice.setType("0");
+                    myNotice.setCreateUser("管理员");
+                    myNotice.setCreateTime(new Date());
+
+                    for (String noticeUserId : noticeUserList) {
+                        myNotice.setNoticeId(noticeUserId);
+                        myNotice.setNoticeName(UserUtils.get(noticeUserId).getName());
+                        //根据taskName和通知人 查询重复数量
+                        MyNoticeList repetitionCountBymyNotice = myNoticeService.getRepetitionCountBymyNotice(myNotice);
+                        if(null == repetitionCountBymyNotice){
+                            // 生成id
+                            String id = UUID.randomUUID().toString().replace("-", "");
+                            myNotice.setId(id);
+                            myNotice.setRepetitionCount(0);
+                            myNoticeService.insertMyNotice(myNotice);
+                        }else{
+                            myNotice.setId(repetitionCountBymyNotice.getId());
+                            myNotice.setRepetitionCount(repetitionCountBymyNotice.getRepetitionCount()+1);
+                            myNoticeService.updateMyNotice(myNotice);
+                        }
+                    }
+
+                }
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * 计算两日期相差天数
+     * @param beginDate
+     * @param endDate
+     * @return
+     * @throws Exception
+     */
+    public String getInterval(Date beginDate, Date endDate){
+        long day = 0;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        try {
+            if(beginDate != null){
+                String begin = sdf.format(beginDate);
+                beginDate  = sdf.parse(begin);
+            }
+            if(endDate!= null){
+                String end= sdf.format(endDate);
+                endDate= sdf.parse(end);
+            }
+        } catch (Exception e){
+            e.getMessage();
+        }
+        day = (endDate.getTime()-beginDate.getTime())/(24*60*60*1000);
+        return String.valueOf(day);
+    }
+    public static String dateToString(Date date) {
+        SimpleDateFormat sformat = new SimpleDateFormat("yyyy-MM-dd");//日期格式
+
+        // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//24小时制
+        // SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");//12小时制
+
+        String s = sformat.format(date);
+
+        return s;
+    }
+
 }

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/workClientInfo/service/CwWorkClientService.java

@@ -30,7 +30,7 @@ import com.jeeplus.test.cw.workClientInfo.service.mapstruct.CwWorkClientContactW
 import com.jeeplus.test.cw.workClientInfo.service.mapstruct.CwWorkClientTypeWrapper;
 import com.jeeplus.test.mould.service.SerialnumTplService;
 import com.jeeplus.test.oss.service.OssService;
-import com.jeeplus.test.program.configuration.projectList.service.dto.ProjectListDto;
+import com.jeeplus.flowable.utils.FlowTaskUtil;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -107,7 +107,13 @@ public class CwWorkClientService extends ServiceImpl<CwWorkClientBaseMapper, CwW
                 }
             }
         }
-        return cwWorkClientBaseMapper.findList(page, queryWrapper);
+        IPage<CwWorkClientBaseDTO> list = cwWorkClientBaseMapper.findList(page, queryWrapper);
+        List<CwWorkClientBaseDTO> records = list.getRecords();
+        //处理数据
+        FlowTaskUtil util = new FlowTaskUtil();
+        List<CwWorkClientBaseDTO> cwWorkClientBaseDTOS = util.taskDispose(records);
+        list.setRecords(cwWorkClientBaseDTOS);
+        return list;
     }
 
     public IPage<CwWorkClientBaseDTO> findListTree(Page<CwWorkClientBaseDTO> page, CwWorkClientBaseDTO cwWorkClientBaseDTO) throws Exception{

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -156,4 +156,12 @@ public interface UserMapper extends BaseMapper<User> {
      */
     List <UserDTO> getUserInfoByRoleName(String roleName);
 
+    /**
+     * 根据人员名称查询人员信息
+     *
+     * @param name 名称
+     * @return
+     */
+    UserDTO getUserByName(String name);
+
 }

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -308,4 +308,13 @@
 		 order by a.id
 	</select>
 
+	<select id="getUserByName" resultType="com.jeeplus.sys.service.dto.UserDTO">
+		select a.id, a.company_id as "companyDTO.id", a.office_id as "officeDTO.id", a.login_name as "loginName", a.is_admin as "isAdmin",
+		a.password, a.no, a.name, a.email, a.phone, a.mobile, a.login_ip as "loginIp", a.login_date as "loginDate", a.remarks,
+		a.login_flag, a.photo, a.qr_code, a.sign, a.create_by as "createBy.id", a.create_date, a.update_by as "updateBy.id",
+		a.update_date
+		from sys_user a
+		where `name` = #{name}
+	</select>
+
 </mapper>

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -136,6 +136,17 @@ public class UserService  extends ServiceImpl<UserMapper, User> {
 	}
 
 	/**
+	 * 根据登录名获取用户
+	 * @param name
+	 * @return
+	 */
+	public UserDTO getUserByName(String name) {
+		UserDTO userDTO = userMapper.getUserByName(name);
+
+		return userDTO;
+	}
+
+	/**
 	 * 根据登录名获取用户,不使用缓存
 	 * @param loginName
 	 * @return

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/utils/UserUtils.java

@@ -34,6 +34,8 @@ public class UserUtils {
 
 	private static OfficeMapper officeMapper = SpringContextHolder.getBean(OfficeMapper.class);
 
+	private static UserService userService = SpringContextHolder.getBean(UserService.class);
+
 	/**
 	 * 根据ID获取用户
 	 * @param id
@@ -60,6 +62,17 @@ public class UserUtils {
 	}
 
 	/**
+	 * 根据用户名获取用户
+	 * @param name
+	 * @return 取不到返回null
+	 */
+	@InterceptorIgnore
+	public static UserDTO getByName(String name){
+		UserDTO userDTO = userService.getUserByName ( name );
+		return userDTO;
+	}
+
+	/**
 	 * 清除当前用户缓存
 	 */
 	public static void deleteCache(UserDTO userDTO){

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/FlowMapper.java

@@ -33,4 +33,6 @@ public interface FlowMapper extends BaseMapper <Flow> {
      * @return
      */
     ActRuTaskInfo getTaskInfoByTaskId(String taskId);
+
+    String getTaskIdByprocInstId(String procInsId);
 }

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/MyNoticeListMapper.java

@@ -20,4 +20,23 @@ public interface MyNoticeListMapper extends BaseMapper<MyNoticeList> {
      */
     public IPage<MyNoticeList> selectPage(Page<MyNoticeList> page, @Param("myNotice") MyNoticeList myNotice);
 
+    /**
+     * 根据通知信息查询详情
+     * @param myNoticeList
+     * @return
+     */
+    MyNoticeList getRepetitionCountBymyNotice(MyNoticeList myNoticeList);
+
+    /**
+     * 保存通知信息
+     * @param myNoticeList
+     */
+    void insertMyNotice(MyNoticeList myNoticeList);
+
+    /**
+     * 修改通知信息
+     * @param myNoticeList
+     */
+    void updateMyNotice(MyNoticeList myNoticeList);
+
 }

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/xml/FlowMapper.xml

@@ -67,4 +67,8 @@
 		limit 1
 	</select>
 
+	<select id="getTaskIdByprocInstId" resultType="java.lang.String">
+		select ID_ from act_hi_procinst where PROC_INST_ID_ = #{procInstId}
+	</select>
+
 </mapper>

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/mapper/xml/MyNoticeListMapper.xml

@@ -35,4 +35,79 @@
 		${ew.customSqlSegment}
 	</select>
 
+	<select id="getRepetitionCountBymyNotice" resultType="com.jeeplus.flowable.model.MyNoticeList">
+		select
+		  a.id,
+		  a.create_by,
+		  a.create_date,
+		  a.update_by,
+		  a.update_date,
+		  a.del_flag,
+		  a.task_id,
+		  a.title,
+		  a.def_id,
+		  a.task_name,
+		  a.link,
+		  a.create_user,
+		  a.create_time,
+		  a.type,
+		  a.repetition_count,
+		  a.notice_id
+		from
+		  my_notice_list a
+		<where>
+			a.del_flag = 0
+			and a.notice_id = #{noticeId}
+			and a.task_name = #{taskName}
+		</where>
+	</select>
+
+	<insert id="insertMyNotice">
+		insert into my_notice_list (
+		  id,
+		  create_by,
+		  create_date,
+		  update_by,
+		  update_date,
+		  del_flag,
+		  task_id,
+		  title,
+		  def_id,
+		  task_name,
+		  link,
+		  create_user,
+		  create_time,
+		  notice_name,
+		  notice_id,
+		  `type`,
+		  repetition_count
+		)
+		values
+		  (
+			#{id},
+			#{createBy},
+			#{createDate},
+			#{updateBy},
+			#{updateDate},
+			#{delFlag},
+			#{taskId},
+			#{title},
+			#{defId},
+			#{taskName},
+			#{link},
+			#{createUser},
+			#{createTime},
+			#{noticeName},
+			#{noticeId},
+			#{type},
+			#{repetitionCount}
+		  ) ;
+	</insert>
+
+	<update id="updateMyNotice">
+		update my_notice_list
+		set `type` = 0,
+		repetition_count = #{repetitionCount}
+		where id = #{id}
+	</update>
 </mapper>

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/FlowTaskService.java

@@ -990,4 +990,8 @@ public class FlowTaskService {
         return flowMapper.getTaskInfoByTaskId(taskId);
     }
 
+    public String getTaskIdByprocInstId(String procInsId){
+        return flowMapper.getTaskIdByprocInstId(procInsId);
+    }
+
 }

jeeplus-plugins/jeeplus-flowable/src/main/java/com/jeeplus/flowable/service/MyNoticeService.java

@@ -141,4 +141,31 @@ public class MyNoticeService {
         mapper.readAll(userDTO.getName());
         return "操作成功";
     }
+
+    /**
+     * 根据通知信息查询数据
+     * @param myNoticeList
+     * @return
+     */
+    public MyNoticeList getRepetitionCountBymyNotice(MyNoticeList myNoticeList){
+        return mapper.getRepetitionCountBymyNotice(myNoticeList);
+    }
+
+    /**
+     * 根据通知信息查询数据
+     * @param myNoticeList
+     * @return
+     */
+    public void insertMyNotice(MyNoticeList myNoticeList){
+        mapper.insertMyNotice(myNoticeList);
+    }
+
+    /**
+     * 根据通知信息查询数据
+     * @param myNoticeList
+     * @return
+     */
+    public void updateMyNotice(MyNoticeList myNoticeList){
+        mapper.updateMyNotice(myNoticeList);
+    }
 }

jeeplus-plugins/jeeplus-quartz/pom.xml

@@ -28,6 +28,12 @@
             <artifactId>jeeplus-admin</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.jeeplus</groupId>
+            <artifactId>jeeplus-test</artifactId>
+            <version>9.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

jeeplus-plugins/jeeplus-quartz/src/main/java/com/jeeplus/quartz/task/cw/CwWorkContractBorrowTask.java

@@ -0,0 +1,24 @@
+package com.jeeplus.quartz.task.cw;
+
+import com.jeeplus.sys.utils.SpringContextHolder;
+import com.jeeplus.test.cw.contractRegistration.service.CwWorkContractBorrowService;
+import org.quartz.DisallowConcurrentExecution;
+import com.jeeplus.quartz.domain.Task;
+
+/**
+ * 财务借用临期提醒通知定时任务
+ * @author: 徐滕
+ * @version: 2022-12-12 16:13
+ */
+@DisallowConcurrentExecution
+public class CwWorkContractBorrowTask extends Task {
+
+    private CwWorkContractBorrowService cwProjectReportService = SpringContextHolder.getBean(CwWorkContractBorrowService.class);
+
+    @Override
+    public void run() {
+        cwProjectReportService.getAdventMessageList();
+        System.out.println("这是测试任务TestTask。");
+
+    }
+}

jeeplus-web/src/main/resources/application-development.yml

@@ -246,7 +246,7 @@ apptoken: uIJQmTwyGJ
 appsecret: 2NMBqFigKoInmd43Wohxv5aEDKiiHo
 signature: 232a44ee9ebd251d119f0a65628f678e
 
-signature_http_top: http://192.168.2.130:9182
+signature_http_top: https://3m0m810894.goho.co
 
 #竖版模板templateId
 vertical_templateId: 2894156236229259396
@@ -259,7 +259,7 @@ company_round_seal_id_vertical: 2898043523878957918
 #公司方章
 company_parties_seal_id: 2894163220106129636
 #审定单用印流程id
-approval_category_id: 3032265972836684447
+approval_category_id: 3032955004099797473
 #报告用印流程id
 report_category_id: 2895618951099527314
 ##审定内用印流程id

jeeplus-web/src/main/resources/application-production.yml

@@ -261,7 +261,7 @@ company_round_seal_id_vertical: 2898043523878957918
 #公司方章
 company_parties_seal_id: 2894163220106129636
 #审定单用印流程id
-approval_category_id: 3032265972836684447
+approval_category_id: 3032955004099797473
 #报告用印流程id
 report_category_id: 2895618951099527314
 ##审定内用印流程id