备忘录

assistMg/src/main/java/com/hotent/project/controller/CostProjectMemoController.java

@@ -14,6 +14,7 @@ import com.hotent.project.resp.CostProjectMemoQueryResp;
 import com.hotent.resp.PageResp;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -58,6 +59,20 @@ public class CostProjectMemoController extends BaseController<CostProjectMemoMan
     public PageList<CostProjectMemo> pageList(@RequestBody CostProjectMemoQueryReq req) throws Exception {
         return  costProjectMemoManager.pageList(req);
     }
+
+    @PostMapping(value="/pageIndexList")
+    @ApiOperation(value="备忘录列表")
+    public PageList<CostProjectMemo> pageIndexList(@RequestBody CostProjectMemoQueryReq req) throws Exception {
+        return  costProjectMemoManager.pageIndexList(req);
+    }
+
+    @PostMapping(value="/save")
+    @ApiOperation(value="添加")
+    @Transactional(rollbackFor = Exception.class)
+    public CommonResult save(@RequestBody CostProjectMemo t) {
+        Boolean result = costProjectMemoManager.saveData(t);
+        return CommonResult.ok().value(result ? "添加成功" : "添加失败");
+    }
     /**
      * 根据id获取监审项目备忘录表数据详情
      * @param id

assistMg/src/main/java/com/hotent/project/dao/CostProjectMemoDao.java

@@ -30,4 +30,6 @@ public interface CostProjectMemoDao extends BaseMapper<CostProjectMemo> {
             , @Param("memoDate") LocalDate memoDate
             , @Param("startTime") LocalDate startTime
             , @Param("endTime") LocalDate endTime);
+
+    Page<CostProjectMemo> getIndexList(Page<CostProjectMemo> objectPage,@Param("userId") String userId,@Param("content") String content,@Param("memoDate") LocalDate memoDate);
 }

assistMg/src/main/java/com/hotent/project/manager/CostProjectMemoManager.java

@@ -1,6 +1,7 @@
 package com.hotent.project.manager;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.hotent.base.model.CommonResult;
 import com.hotent.base.query.PageList;
 import com.hotent.project.model.CostProjectMemo;
 import com.hotent.base.manager.BaseManager;
@@ -38,4 +39,8 @@ public interface CostProjectMemoManager extends BaseManager<CostProjectMemo> {
 	PageList<CostProjectMemo> pageList(CostProjectMemoQueryReq costProjectMemoQueryReq) throws Exception;
 
     public int updateMemo(CostProjectMemoUpdateReq req);
+
+    Boolean saveData(CostProjectMemo t);
+
+	PageList<CostProjectMemo> pageIndexList(CostProjectMemoQueryReq req);
 }

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectMemoManagerImpl.java

@@ -9,10 +9,10 @@ import com.hotent.base.query.PageList;
 import com.hotent.base.util.StringUtil;
 import com.hotent.baseInfo.model.AuditedUnit;
 import com.hotent.project.dao.CostProjectApprovalDao;
-import com.hotent.project.model.CostAnnualPlan;
-import com.hotent.project.model. CostProjectApproval;
+import com.hotent.project.manager.CostNoticeManager;
+import com.hotent.project.manager.CostProjectApprovalManager;
+import com.hotent.project.model.*;
 import com.hotent.project.model.CostProjectApproval;
-import com.hotent.project.model.CostProjectMemo;
 import com.hotent.project.dao.CostProjectMemoDao;
 import com.hotent.project.manager.CostProjectMemoManager;
 import com.hotent.base.manager.impl.BaseManagerImpl;
@@ -25,11 +25,13 @@ import com.hotent.uc.manager.UserManager;
 import com.hotent.uc.model.User;
 import com.hotent.uc.util.ContextUtil;
 import com.hotent.util.CopyUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -59,6 +61,12 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 	@Autowired
 	private UserManager userService;
 
+	@Autowired
+	private CostProjectApprovalManager projectApprovalManager;
+
+	@Autowired
+	private CostNoticeManager costNoticeManager;
+
 	@Override
 	public CostProjectMemoDetailResp getDetail(String id) {
 
@@ -103,7 +111,7 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 			qw.like(CostProjectMemo::getCreateTime, req.getYear());
 		}
 		qw.orderByDesc(CostProjectMemo::getId);*/
-		
+
 		// 使用MyBatis Plus分页查询
 		/*Page<CostProjectMemo> page = new Page<>(req.getPageNum(), req.getPageSize());
 		IPage<CostProjectMemo> costProjectMemoIPage = this.page(page, qw);
@@ -115,7 +123,7 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 				.filter(java.util.Objects::nonNull)
 				.distinct()
 				.collect(Collectors.toList());
-				
+
 		Map<String,  CostProjectApproval> planNameMap;
 		if (!planNameIds.isEmpty()) {
 			LambdaQueryWrapper< CostProjectApproval> qwPlan = new LambdaQueryWrapper<>();
@@ -147,7 +155,7 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 		// 构造返回的分页对象
 		Page<CostProjectMemoQueryResp> respPage = new Page<>(req.getPageNum(), req.getPageSize(), costProjectMemoIPage.getTotal());
 		respPage.setRecords(costProjectMemoQueryResps);*/
-		
+
 		//return respPage;
 
 
@@ -189,4 +197,52 @@ public class CostProjectMemoManagerImpl extends BaseManagerImpl<CostProjectMemoD
 		costProjectMemoDao.updateMemo( copy);
 		return 0;
 	}
+
+    @Override
+    public Boolean saveData(CostProjectMemo t) {
+		boolean save = this.save(t);
+		if (save){
+			String projectId = t.getProjectId();
+			CostProjectApproval projectApproval = projectApprovalManager.getById(projectId);
+			if (projectApproval != null) {
+				List<CostNotice> noticeList = new ArrayList<>();
+				String leaderId = projectApproval.getLeaderId();
+				if(StringUtils.isNotBlank(leaderId)){
+					CostNotice costNotice = new CostNotice();
+					costNotice.setNoticeTitle(t.getTitle());
+					costNotice.setProjectId(t.getProjectId());
+					costNotice.setStatus("0");
+					costNotice.setNoticeType("1");
+					costNotice.setNoticeContent(t.getContent());
+					costNotice.setSendTarget(leaderId);
+					noticeList.add(costNotice);
+				}
+				String auditGroup = projectApproval.getAuditGroup();
+				if(StringUtils.isNotBlank(auditGroup)){
+					String[] split = auditGroup.split(",");
+					for (String s : split) {
+						CostNotice costNotice = new CostNotice();
+						costNotice.setNoticeTitle(t.getTitle());
+						costNotice.setProjectId(t.getProjectId());
+						costNotice.setStatus("0");
+						costNotice.setNoticeType("1");
+						costNotice.setNoticeContent(t.getContent());
+						costNotice.setSendTarget(s);
+						noticeList.add(costNotice);
+					}
+				}
+				costNoticeManager.saveBatch(noticeList);
+			}
+		}
+		return true;
+    }
+
+	@Override
+	public PageList<CostProjectMemo> pageIndexList(CostProjectMemoQueryReq req) {
+		IUser iUser = ContextUtil.getCurrentUser();
+		String userId = iUser.getUserId();
+		Page<CostProjectMemo> objectPage = new Page<>(req.getPage(),req.getPageSize());
+		Page<CostProjectMemo> page =baseMapper.getIndexList(objectPage,userId,req.getContent(),req.getMemoDate());
+		return new PageList<>(page);
+	}
 }

assistMg/src/main/resources/mapper/CostProjectMemoMapper.xml

@@ -55,27 +55,27 @@
 	</update>
 
 	<select id="selectPage" resultMap="BaseResultMap">
-		select 
-			<include refid="Base_Column_List"/> 
+		select
+			<include refid="Base_Column_List"/>
 		from
 			cost_project_memo
 		${ew.customSqlSegment}
 	</select>
-	
+
 	<select id="selectList" resultMap="BaseResultMap">
-		select 
-			<include refid="Base_Column_List"/> 
+		select
+			<include refid="Base_Column_List"/>
 		from
 			cost_project_memo
 		${ew.customSqlSegment}
 	</select>
-	
+
 	<select id="selectById" resultMap="BaseResultMap">
-		select 
-			<include refid="Base_Column_List"/> 
+		select
+			<include refid="Base_Column_List"/>
 		from
 			cost_project_memo
-		where 
+		where
 		    id = ${id}
 	</select>
 
@@ -105,7 +105,10 @@
 		</if>
 
 		<if test=" year != null and year != '' ">
-			AND cpm.year LIKE CONCAT('%', #{year}, '%')
+			AND date_format(cpm.memo_date, '%Y') = #{year}
+		</if>
+		<if test=" memoDate != null and memoDate != '' ">
+			  AND DATE_FORMAT(cpm.memo_date, '%Y-%m-%d') = #{memoDate}
 		</if>
 
 		<if test="startTime != null and endTime != null
@@ -124,5 +127,31 @@
 		</if>
 		ORDER BY cpm.create_time DESC
 	</select>
+	<select id="getIndexList" resultType="com.hotent.project.model.CostProjectMemo">
+        SELECT
+        cpm.id,
+        cpm.project_id,
+        cpa.project_name,
+        cpm.memo_date,
+        cpm.title,
+        cpm.content,
+        cpm.reminder_type
+        FROM
+        cost_project_memo cpm,
+        cost_project_approval cpa,
+        uc_user uc
+        WHERE
+        cpm.project_id = cpa.project_id
+        AND uc.ACCOUNT_ = cpm.create_by
+        <if test="userId != null and userId != ''">
+            and (cap.leader_id = #{userId} or cap.audit_group like concat('%,',#{userId},',%'))
+        </if>
+        <if test=" content != null and content != '' ">
+            AND cpm.content LIKE CONCAT('%', #{content}, '%')
+        </if>
+        <if test=" memoDate != null and memoDate != '' ">
+            AND DATE_FORMAT(cpm.memo_date, '%Y-%m-%d') = #{memoDate}
+        </if>
+    </select>
 
 </mapper>