Merge remote-tracking branch 'origin/master'

blade-service-api/blade-control-api/src/main/java/org/springblade/control/dto/DepartmentMonthPlanDTO.java

@@ -0,0 +1,29 @@
+package org.springblade.control.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.control.entity.DepartmentMonthPlan;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/7/27 18:01
+ **/
+@Data
+public class DepartmentMonthPlanDTO {
+
+    @ApiModelProperty(value = "部门类型")
+    private Integer departmentType;
+
+
+    @ApiModelProperty(value = "计划开始日期")
+    private String planStartDate;
+
+    @ApiModelProperty(value = "计划结束日期")
+    private String planEndDate;
+}

blade-service-api/blade-control-api/src/main/java/org/springblade/control/entity/UserpayInfo.java

@@ -46,6 +46,12 @@ public class UserpayInfo extends BaseEntity {
     @ApiModelProperty(value = "用户id主键")
     private Long userId;
 
+    /**
+     * 用户id主键
+     */
+    @ApiModelProperty(value = "用户名称")
+    private String name;
+
     /**
      * yyyy-mm 格式
      */

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -16,7 +16,6 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.resource.feign.NewIOSSClient;
 import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/blade-control/src/main/java/org/springblade/control/controller/DepartmentMonthPlanController.java

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.control.dto.ControlContractInfoDTO;
+import org.springblade.control.dto.DepartmentMonthPlanDTO;
 import org.springblade.control.dto.ProjectCostBudgetDTO;
 import org.springblade.control.entity.DepartmentMonthPlan;
 import org.springblade.control.entity.DictInfo;
@@ -41,7 +42,7 @@ public class DepartmentMonthPlanController {
     @GetMapping("/getPage")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "部门月计划分页")
-    public R<List<DepartmentMonthPlanVO>> getPage(ControlContractInfoDTO dto, Query query) {
+    public R<List<DepartmentMonthPlanVO>> getPage(DepartmentMonthPlanDTO dto, Query query) {
         return R.data(planService.getPage(dto,query));
     }
 

blade-service/blade-control/src/main/java/org/springblade/control/controller/ProjectCostBudgetController.java

@@ -39,9 +39,11 @@ public class ProjectCostBudgetController {
      */
     @GetMapping("/page")
     @ApiOperationSupport(order = 1)
-    @ApiOperation(value = "分页获取计划列表")
+    @ApiOperation(value = "分页获取计划列表",notes = "搜索值queryValue")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "queryValue", value = "搜索值", required = false),
+            @ApiImplicitParam(name = "projectType", value = "项目类型", required = false),
+            @ApiImplicitParam(name = "projectServerType", value = "项目服务类型", required = false),
     })
     public R<List<ControlProjectInfoVO>> page(ControlProjectInfoDTO dto, Query query){
         return R.data(budgetService.page(dto,query));

blade-service/blade-control/src/main/java/org/springblade/control/excel/UserpayExcel.java

@@ -34,18 +34,18 @@ import java.math.BigDecimal;
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-public class UserpayExcel implements Serializable {
+public class UserpayExcel{
     private static final long serialVersionUID = 1L;
 
     @ColumnWidth(15)
     @ExcelProperty("姓名")
-    private String userName;
+    private String name;
 
 /*    @ColumnWidth(15)
     @ExcelProperty("薪酬时间")
     private String costTime;*/
 
-
+/*
     @ColumnWidth(15)
     @ExcelProperty(value = "应出勤天数")
     private Integer yaAllDays;
@@ -120,6 +120,6 @@ public class UserpayExcel implements Serializable {
 
     @ColumnWidth(15)
     @ExcelProperty(value = "描述")
-    private String desc;
+    private String desc;*/
 
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/DepartmentMonthPlanMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.control.dto.ControlContractInfoDTO;
 import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.dto.DepartmentMonthPlanDTO;
 import org.springblade.control.entity.ControlProjectInfo;
 import org.springblade.control.entity.DepartmentMonthPlan;
 import org.springblade.control.entity.DictInfo;
@@ -26,7 +27,7 @@ public interface DepartmentMonthPlanMapper extends BaseMapper<DepartmentMonthPla
 
     String getDepartmentName(@Param("departmentType") Integer departmentType);
 
-    List<DepartmentMonthPlanVO> getPage(IPage page,@Param("dto") ControlContractInfoDTO dto,@Param("userId") Long userId);
+    List<DepartmentMonthPlanVO> getPage(IPage page, @Param("dto") DepartmentMonthPlanDTO dto, @Param("userId") Long userId);
 
     List<BladeUser> getDepartmentUserDict(@Param("type") Integer departmentType);
 

blade-service/blade-control/src/main/java/org/springblade/control/mapper/DepartmentMonthPlanMapper.xml

@@ -28,6 +28,12 @@
                 (select bu.name from blade_user bu WHERE bu.id = dmp.plan_designer) as 'planDesignerName'
         FROM c_department_month_plan dmp
         where dmp.plan_designer = #{userId} and dmp.is_deleted = 0
+        <if test="dto.departmentType != null and dto.departmentType != ''">
+            and dmp.department_type = #{dto.departmentType}
+        </if>
+        <if test="dto.planStartDate != null and dto.planStartDate != ''">
+            and DATE_FORMAT(dmp.plan_start_date ,'%Y-%m') BETWEEN #{dto.planStartDate} AND #{dto.planEndDate}
+        </if>
         order by dmp.plan_start_date desc
     </select>
     <select id="getDepartmentUserDict" resultType="org.springblade.core.secure.BladeUser">

blade-service/blade-control/src/main/java/org/springblade/control/mapper/UserpayInfoMapper.xml

@@ -27,6 +27,7 @@
         <result column="social_sec" property="socialSec"/>
         <result column="net_salary" property="netSalary"/>
         <result column="desc" property="desc"/>
+        <result column="name" property="name"/>
     </resultMap>
 
     <resultMap id="userpayInfoResultVOMap" type="org.springblade.control.vo.UserpayInfoVO">
@@ -58,14 +59,16 @@
 
 
     <select id="selectUserpayInfoPage" resultMap="userpayInfoResultVOMap">
-        select *,(SELECT name from blade_user b where a.user_id = b.id) as name from c_user_pay_info a
+        select *
+             /*,(SELECT name from blade_user b where a.user_id = b.id) as name */
+        from c_user_pay_info a
         where a.is_deleted = 0
     </select>
 
 
 
     <delete id="delUserPayInoByDate">
-        delete from m_role_post where cost_time = #{date}
+        delete from c_user_pay_info where DATE_FORMAT(cost_time,'%Y-%m') = #{date}
     </delete>
 
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/IDepartmentMonthPlanService.java

@@ -2,6 +2,7 @@ package org.springblade.control.service;
 
 import org.springblade.control.dto.ControlContractInfoDTO;
 import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.dto.DepartmentMonthPlanDTO;
 import org.springblade.control.dto.ProjectCostBudgetDTO;
 import org.springblade.control.entity.DepartmentMonthPlan;
 import org.springblade.control.entity.DictInfo;
@@ -22,7 +23,7 @@ import java.util.List;
  **/
 public interface IDepartmentMonthPlanService extends BaseService<DepartmentMonthPlan> {
 
-    List<DepartmentMonthPlanVO> getPage(ControlContractInfoDTO dto, Query query) ;
+    List<DepartmentMonthPlanVO> getPage(DepartmentMonthPlanDTO dto, Query query) ;
 
     List<ProjectCostBudgetVO> addDepartmentPlan(DepartmentMonthPlan plan);
 

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/DepartmentMonthPlanServiceImpl.java

@@ -7,6 +7,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.control.dto.ControlContractInfoDTO;
 import org.springblade.control.dto.ControlProjectInfoDTO;
+import org.springblade.control.dto.DepartmentMonthPlanDTO;
 import org.springblade.control.dto.ProjectCostBudgetDTO;
 import org.springblade.control.entity.*;
 import org.springblade.control.mapper.DepartmentMonthPlanMapper;
@@ -50,7 +51,7 @@ public class DepartmentMonthPlanServiceImpl extends BaseServiceImpl<DepartmentMo
      * 部门月计划分页
      */
     @Override
-    public List<DepartmentMonthPlanVO> getPage(ControlContractInfoDTO dto, Query query) {
+    public List<DepartmentMonthPlanVO> getPage(DepartmentMonthPlanDTO dto, Query query) {
         IPage page = new Page(query.getCurrent(), query.getSize());
         BladeUser user = AuthUtil.getUser();
         return baseMapper.getPage(page,dto,user.getUserId());

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/PlanInformServiceImpl.java

@@ -55,7 +55,7 @@ public class PlanInformServiceImpl extends BaseServiceImpl<PlanInformMapper, Pla
      * @param taskName 任务名称
      * @param taskUser 任务人Id
      * @param appUserName 审批人名称
-     * @param status 审批状态 0=未上报 1=待审批 2=已审批 3=已驳回
+     * @param status 审批状态 0=未上报 1=待审批 2=已审批 3=已驳回 4=转移已经通过
      */
     @Override
     public void taskFinishedInform(String taskName, Long taskUser, String appUserName,Integer status) {
@@ -66,6 +66,8 @@ public class PlanInformServiceImpl extends BaseServiceImpl<PlanInformMapper, Pla
             str.append("《" + taskName + "》" + "已被" + "【" + appUserName + "】" + "驳回");
         }else if (status == 1){
             str.append("【" + appUserName + "】" + "向您发起《"+taskName+"》审批");
+        }else if (status == 4){
+            str.append("《" + taskName + "》" + "已被" + "【" + appUserName + "】" + "审批通过");
         }
         PlanInform inform = new PlanInform();
         inform.setInformDetails(str.toString());