添加工作组进度
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
package com.jero.mail.vo;
|
||||
|
||||
import com.jero.mail.entity.PayMailBill;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class MailBillVO extends PayMailBill implements Serializable{
|
||||
/**
|
||||
* 项目名称
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.jero.project.VO;
|
||||
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
@Data
|
||||
public class PayWorkingGroupVO extends PayWorkingGroup implements Serializable {
|
||||
/**
|
||||
* 已付全款
|
||||
*/
|
||||
private Integer allPayment;
|
||||
/**
|
||||
* 部分付款
|
||||
*/
|
||||
private Integer partPayment;
|
||||
/**
|
||||
* 未付款
|
||||
*/
|
||||
private Integer notPayment;
|
||||
}
|
||||
+26
-17
@@ -7,13 +7,16 @@ import java.util.stream.Collectors;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.common.util.ValidUtil;
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.VO.PayWorkingGroupVO;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
import com.jero.project.service.IPayWorkingGroupService;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
@@ -21,7 +24,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.project.service.IPayWorkingGroupSubitemService;
|
||||
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -47,7 +50,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
|
||||
@Autowired
|
||||
private ISysUserService sysUserService;
|
||||
@Autowired
|
||||
private IPayWorkingGroupSubitemService payWorkingGroupSubitemService;
|
||||
private IPayWorkingGroupSubItemService payWorkingGroupSubItemService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
@@ -64,33 +67,39 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
// todo 缺少验证
|
||||
QueryWrapper<PayWorkingGroup> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroup, req.getParameterMap());
|
||||
Page<PayWorkingGroup> page = new Page<PayWorkingGroup>(pageNo, pageSize);
|
||||
IPage<PayWorkingGroup> pageList = payWorkingGroupService.page(page, queryWrapper);
|
||||
if(!StringUtils.isBlank(payWorkingGroup.getWorkingGroupProject()) && payWorkingGroup.getWorkingGroupProject().length() > 50){
|
||||
return Result.error("工作组项目长度应小于50个字符");
|
||||
}
|
||||
Page<PayWorkingGroupVO> page = new Page<PayWorkingGroupVO>(pageNo, pageSize);
|
||||
IPage<PayWorkingGroupVO> pageList = payWorkingGroupService.queryPageList(page, payWorkingGroup);
|
||||
if(!Objects.isNull(pageList)){
|
||||
List<PayWorkingGroup> listPayWorkingGroup = pageList.getRecords();
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroup)){
|
||||
listPayWorkingGroup.forEach(p->{
|
||||
LambdaQueryWrapper<PayWorkingGroupSubitem> query = new LambdaQueryWrapper<>();
|
||||
query.eq(PayWorkingGroupSubitem::getWorkingGroupId,p.getId());
|
||||
List<PayWorkingGroupSubitem> listPayWorkingGroupSubitem = payWorkingGroupSubitemService.list(query);
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubitem)){
|
||||
List<PayWorkingGroupVO> listPayWorkingGroupVO = pageList.getRecords();
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupVO)){
|
||||
listPayWorkingGroupVO.forEach(p->{
|
||||
LambdaQueryWrapper<PayWorkingGroupSubItem> query = new LambdaQueryWrapper<>();
|
||||
query.eq(PayWorkingGroupSubItem::getWorkingGroupId,p.getId());
|
||||
List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(query);
|
||||
if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
|
||||
// 已付全款
|
||||
List<PayWorkingGroupSubitem> listAllPayment = listPayWorkingGroupSubitem.stream()
|
||||
List<PayWorkingGroupSubItem> listAllPayment = listPayWorkingGroupSubItem.stream()
|
||||
.filter(p1->p1.getPaidAmount() == p1.getReceivableAmount()).collect(Collectors.toList());
|
||||
p.setAllPayment(listAllPayment.size());
|
||||
// 部分付款
|
||||
List<PayWorkingGroupSubitem> listPartPayment = listPayWorkingGroupSubitem.stream()
|
||||
List<PayWorkingGroupSubItem> listPartPayment = listPayWorkingGroupSubItem.stream()
|
||||
.filter(p1->p1.getPaidAmount() < p1.getReceivableAmount()).collect(Collectors.toList());
|
||||
p.setPartPayment(listPartPayment.size());
|
||||
// 未付款
|
||||
List<PayWorkingGroupSubitem> listNotPayment = listPayWorkingGroupSubitem.stream()
|
||||
List<PayWorkingGroupSubItem> listNotPayment = listPayWorkingGroupSubItem.stream()
|
||||
.filter(p1->p1.getPaidAmount() == 0 && p1.getReceivableAmount() != 0 )
|
||||
.collect(Collectors.toList());
|
||||
p.setNotPayment(listNotPayment.size());
|
||||
}else{
|
||||
p.setAllPayment(0);
|
||||
p.setPartPayment(0);
|
||||
p.setNotPayment(0);
|
||||
}
|
||||
});
|
||||
pageList.setRecords(listPayWorkingGroupVO);
|
||||
}
|
||||
}
|
||||
return Result.OK(pageList);
|
||||
|
||||
+14
-14
@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletResponse;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.service.IPayWorkingGroupSubitemService;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
@@ -28,9 +28,9 @@ import io.swagger.annotations.ApiOperation;
|
||||
@RestController
|
||||
@RequestMapping("/project/payWorkingGroupSubitem")
|
||||
@Slf4j
|
||||
public class PayWorkingGroupSubitemController extends JeroController<PayWorkingGroupSubitem, IPayWorkingGroupSubitemService> {
|
||||
public class PayWorkingGroupSubItemController extends JeroController<PayWorkingGroupSubItem, IPayWorkingGroupSubItemService> {
|
||||
@Autowired
|
||||
private IPayWorkingGroupSubitemService payWorkingGroupSubitemService;
|
||||
private IPayWorkingGroupSubItemService payWorkingGroupSubitemService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
@@ -43,13 +43,13 @@ public class PayWorkingGroupSubitemController extends JeroController<PayWorkingG
|
||||
*/
|
||||
@ApiOperation(value="工作组成员-分页列表查询", notes="工作组成员-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<?> queryPageList(PayWorkingGroupSubitem payWorkingGroupSubitem,
|
||||
public Result<?> queryPageList(PayWorkingGroupSubItem payWorkingGroupSubitem,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayWorkingGroupSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap());
|
||||
Page<PayWorkingGroupSubitem> page = new Page<PayWorkingGroupSubitem>(pageNo, pageSize);
|
||||
IPage<PayWorkingGroupSubitem> pageList = payWorkingGroupSubitemService.page(page, queryWrapper);
|
||||
QueryWrapper<PayWorkingGroupSubItem> queryWrapper = QueryGenerator.initQueryWrapper(payWorkingGroupSubitem, req.getParameterMap());
|
||||
Page<PayWorkingGroupSubItem> page = new Page<PayWorkingGroupSubItem>(pageNo, pageSize);
|
||||
IPage<PayWorkingGroupSubItem> pageList = payWorkingGroupSubitemService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ public class PayWorkingGroupSubitemController extends JeroController<PayWorkingG
|
||||
*/
|
||||
@ApiOperation(value="工作组成员-添加", notes="工作组成员-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayWorkingGroupSubitem payWorkingGroupSubitem) {
|
||||
public Result<?> add(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubitem) {
|
||||
payWorkingGroupSubitemService.save(payWorkingGroupSubitem);
|
||||
return Result.OK("添加成功!");
|
||||
}
|
||||
@@ -74,7 +74,7 @@ public class PayWorkingGroupSubitemController extends JeroController<PayWorkingG
|
||||
*/
|
||||
@ApiOperation(value="工作组成员-编辑", notes="工作组成员-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody PayWorkingGroupSubitem payWorkingGroupSubitem) {
|
||||
public Result<?> edit(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubitem) {
|
||||
payWorkingGroupSubitemService.updateById(payWorkingGroupSubitem);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
@@ -114,7 +114,7 @@ public class PayWorkingGroupSubitemController extends JeroController<PayWorkingG
|
||||
@ApiOperation(value="工作组成员-通过id查询", notes="工作组成员-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
PayWorkingGroupSubitem payWorkingGroupSubitem = payWorkingGroupSubitemService.getById(id);
|
||||
PayWorkingGroupSubItem payWorkingGroupSubitem = payWorkingGroupSubitemService.getById(id);
|
||||
if(payWorkingGroupSubitem==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
@@ -129,8 +129,8 @@ public class PayWorkingGroupSubitemController extends JeroController<PayWorkingG
|
||||
*/
|
||||
@GetMapping(value = "/exportXls")
|
||||
@ApiOperation(value="工作组成员-导出excel", notes="工作组成员-导出excel")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubitem payWorkingGroupSubitem) {
|
||||
return super.exportXls(request, payWorkingGroupSubitem, PayWorkingGroupSubitem.class, "pay_working_group_subitem");
|
||||
public ModelAndView exportXls(HttpServletRequest request, PayWorkingGroupSubItem payWorkingGroupSubitem) {
|
||||
return super.exportXls(request, payWorkingGroupSubitem, PayWorkingGroupSubItem.class, "pay_working_group_subitem");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -143,7 +143,7 @@ public class PayWorkingGroupSubitemController extends JeroController<PayWorkingG
|
||||
@PostMapping(value = "/importExcel")
|
||||
@ApiOperation(value="工作组成员-通过excel导入数据", notes="工作组成员-通过excel导入数据")
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, PayWorkingGroupSubitem.class);
|
||||
return super.importExcel(request, response, PayWorkingGroupSubItem.class);
|
||||
}
|
||||
|
||||
}
|
||||
+1
-13
@@ -1,7 +1,7 @@
|
||||
package com.jero.project.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.sql.Date;
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
@@ -113,16 +113,4 @@ public class PayWorkingGroup implements Serializable {
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private Date updateTime;
|
||||
/**
|
||||
* 已付全款
|
||||
*/
|
||||
private Integer allPayment;
|
||||
/**
|
||||
* 部分付款
|
||||
*/
|
||||
private Integer partPayment;
|
||||
/**
|
||||
* 未付款
|
||||
*/
|
||||
private Integer notPayment;
|
||||
}
|
||||
|
||||
+49
-25
@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="pay_working_group_subitem对象", description="pay_working_group_subitem")
|
||||
public class PayWorkingGroupSubitem implements Serializable {
|
||||
public class PayWorkingGroupSubItem implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**主键*/
|
||||
@@ -39,38 +39,54 @@ public class PayWorkingGroupSubitem implements Serializable {
|
||||
@Excel(name = "工作组id", width = 15)
|
||||
@ApiModelProperty(value = "工作组id")
|
||||
private java.lang.String workingGroupId;
|
||||
/**成员单位id*/
|
||||
@Excel(name = "成员单位id", width = 15)
|
||||
/**成员单位id*/
|
||||
@Excel(name = "成员单位id", width = 15)
|
||||
@ApiModelProperty(value = "成员单位id")
|
||||
private java.lang.String chargeCompanyId;
|
||||
/**成员单位*/
|
||||
@Excel(name = "成员单位", width = 15)
|
||||
@ApiModelProperty(value = "成员单位")
|
||||
private java.lang.String chargeCompanyName;
|
||||
/**企业联系人一id*/
|
||||
@Excel(name = "企业联系人一id", width = 15)
|
||||
/**临时成员单位id*/
|
||||
@Excel(name = "临时成员单位id", width = 15)
|
||||
@ApiModelProperty(value = "临时成员单位id")
|
||||
private java.lang.String chargeCompanyTemporaryId;
|
||||
/**临时成员单位*/
|
||||
@Excel(name = "临时成员单位", width = 15)
|
||||
@ApiModelProperty(value = "临时成员单位")
|
||||
private java.lang.String chargeCompanyTemporaryName;
|
||||
/**企业联系人一id*/
|
||||
@Excel(name = "企业联系人一id", width = 15)
|
||||
@ApiModelProperty(value = "企业联系人一id")
|
||||
private java.lang.String contactsIdOne;
|
||||
/**企业联系人一名称*/
|
||||
@Excel(name = "企业联系人一名称", width = 15)
|
||||
@ApiModelProperty(value = "企业联系人一名称")
|
||||
private java.lang.String contactsNameOne;
|
||||
/**企业联系人二id*/
|
||||
@Excel(name = "企业联系人二id", width = 15)
|
||||
/**临时企业联系人一id*/
|
||||
@Excel(name = "临时企业联系人一id", width = 15)
|
||||
@ApiModelProperty(value = "临时企业联系人一id")
|
||||
private java.lang.String contactsTemporaryIdOne;
|
||||
/**临时企业联系人一名称*/
|
||||
@Excel(name = "临时企业联系人一名称", width = 15)
|
||||
@ApiModelProperty(value = "临时企业联系人一名称")
|
||||
private java.lang.String contactsTemporaryNameOne;
|
||||
/**企业联系人二id*/
|
||||
@Excel(name = "企业联系人二id", width = 15)
|
||||
@ApiModelProperty(value = "企业联系人二id")
|
||||
private java.lang.String contactsIdTwo;
|
||||
/**企业联系人二名称*/
|
||||
@Excel(name = "企业联系人二名称", width = 15)
|
||||
@ApiModelProperty(value = "企业联系人二名称")
|
||||
private java.lang.String contactsNameTwo;
|
||||
/**企业联系人三id*/
|
||||
@Excel(name = "企业联系人三id", width = 15)
|
||||
/**临时企业联系人二id*/
|
||||
@Excel(name = "临时企业联系人二id", width = 15)
|
||||
@ApiModelProperty(value = "临时企业联系人二id")
|
||||
private java.lang.String contactsTemporaryIdTwo;
|
||||
/**临时企业联系人二名称*/
|
||||
@Excel(name = "临时企业联系人二名称", width = 15)
|
||||
@ApiModelProperty(value = "临时企业联系人二名称")
|
||||
private java.lang.String contactsTemporaryNameTwo;
|
||||
/**企业联系人三id*/
|
||||
@Excel(name = "企业联系人三id", width = 15)
|
||||
@ApiModelProperty(value = "企业联系人三id")
|
||||
private java.lang.String contactsIdThree;
|
||||
/**企业联系人三名称*/
|
||||
@Excel(name = "企业联系人三名称", width = 15)
|
||||
@ApiModelProperty(value = "企业联系人三名称")
|
||||
private java.lang.String contactsNameThree;
|
||||
/**临时企业联系人三id*/
|
||||
@Excel(name = "临时企业联系人三id", width = 15)
|
||||
@ApiModelProperty(value = "临时企业联系人三id")
|
||||
private java.lang.String contactsTemporaryIdThree;
|
||||
/**临时企业联系人三名称*/
|
||||
@Excel(name = "临时企业联系人三名称", width = 15)
|
||||
@ApiModelProperty(value = "临时企业联系人三名称")
|
||||
private java.lang.String contactsTemporaryNameThree;
|
||||
/**应收金额(元)*/
|
||||
@Excel(name = "应收金额(元)", width = 15)
|
||||
@ApiModelProperty(value = "应收金额(元)")
|
||||
@@ -83,6 +99,14 @@ public class PayWorkingGroupSubitem implements Serializable {
|
||||
@Excel(name = "邮寄联系人id", width = 15)
|
||||
@ApiModelProperty(value = "邮寄联系人id")
|
||||
private java.lang.String mailContactsId;
|
||||
/**临时邮寄联系人id*/
|
||||
@Excel(name = "临时邮寄联系人id", width = 15)
|
||||
@ApiModelProperty(value = "临时邮寄联系人id")
|
||||
private java.lang.String mailContactsTemporaryId;
|
||||
/**临时邮寄联系人名称*/
|
||||
@Excel(name = "临时邮寄联系人名称", width = 15)
|
||||
@ApiModelProperty(value = "临时邮寄联系人名称")
|
||||
private java.lang.String mailContactsTemporaryName;
|
||||
/**来款方式(1:无,2:合同,3:收费通知)*/
|
||||
@Excel(name = "来款方式(1:无,2:合同,3:收费通知)", width = 15)
|
||||
@ApiModelProperty(value = "来款方式(1:无,2:合同,3:收费通知)")
|
||||
+10
@@ -2,6 +2,7 @@ package com.jero.project.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.project.VO.PayWorkingGroupVO;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
@@ -13,5 +14,14 @@ import org.apache.ibatis.annotations.Param;
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface PayWorkingGroupMapper extends BaseMapper<PayWorkingGroup> {
|
||||
/**
|
||||
* @Description 分页查询
|
||||
* @Author lqt
|
||||
* @Date 2021/9/1
|
||||
* @Param payWorkingGroup
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
IPage<PayWorkingGroupVO> queryPageList(Page<PayWorkingGroupVO> page, @Param("payWorkingGroup") PayWorkingGroup payWorkingGroup);
|
||||
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.jero.project.mapper;
|
||||
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
* @Date: 2021-08-27
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface PayWorkingGroupSubitemMapper extends BaseMapper<PayWorkingGroupSubitem> {
|
||||
public interface PayWorkingGroupSubItemMapper extends BaseMapper<PayWorkingGroupSubItem> {
|
||||
|
||||
}
|
||||
+37
@@ -1,4 +1,41 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.project.mapper.PayWorkingGroupMapper">
|
||||
<select id="queryPageList" resultType="com.jero.project.VO.PayWorkingGroupVO">
|
||||
SELECT
|
||||
id,
|
||||
working_group_project AS workingGroupProject,
|
||||
year,
|
||||
principal_id_a AS principalIdA,
|
||||
principal_name_a AS principalNameA,
|
||||
principal_id_b AS principalIdB,
|
||||
principal_name_b AS principalNameB,
|
||||
convoke_num AS convokeNum,
|
||||
operation_cycle AS operationCycle,
|
||||
year_charge_a AS yearChargeA,
|
||||
charge_notice_no_a AS chargeNoticeNoA,
|
||||
charge_notice_a_id AS chargeNoticeAId,
|
||||
year_charge_b AS yeaChargeB,
|
||||
charge_notice_no_b AS chargeNoticeNoB,
|
||||
charge_notice_b_id AS chargeNoticeBId,
|
||||
mission_and_objectives AS missionAndObjectives,
|
||||
remarks,
|
||||
create_by AS createBy,
|
||||
create_time AS createTime,
|
||||
update_by AS updateBy,
|
||||
update_time AS updateTime
|
||||
FROM pay_working_group
|
||||
<where>
|
||||
<if test="payWorkingGroup.workingGroupProject != null and payWorkingGroup.workingGroupProject != ''">
|
||||
AND working_group_project LIKE concat('%',concat(#{payWorkingGroup.workingGroupProject},'%'))
|
||||
</if>
|
||||
<if test="payWorkingGroup.principalIdA != null and payWorkingGroup.principalIdA != ''">
|
||||
AND principal_id_a = #{principalIdA}
|
||||
</if>
|
||||
<if test="payWorkingGroup.year != null and payWorkingGroup.year != ''">
|
||||
AND year = #{year}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY create_time DESC
|
||||
</select>
|
||||
</mapper>
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jero.project.mapper.PayWorkingGroupSubitemMapper">
|
||||
<mapper namespace="com.jero.project.mapper.PayWorkingGroupSubItemMapper">
|
||||
|
||||
</mapper>
|
||||
+12
-1
@@ -1,5 +1,8 @@
|
||||
package com.jero.project.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.project.VO.PayWorkingGroupVO;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
@@ -10,5 +13,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IPayWorkingGroupService extends IService<PayWorkingGroup> {
|
||||
|
||||
/**
|
||||
* @Description 分页查询
|
||||
* @Author lqt
|
||||
* @Date 2021/9/1
|
||||
* @Param payWorkingGroup
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
IPage<PayWorkingGroupVO> queryPageList(Page<PayWorkingGroupVO> page,PayWorkingGroup payWorkingGroup);
|
||||
}
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.jero.project.service;
|
||||
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
@@ -9,6 +9,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
* @Date: 2021-08-27
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IPayWorkingGroupSubitemService extends IService<PayWorkingGroupSubitem> {
|
||||
public interface IPayWorkingGroupSubItemService extends IService<PayWorkingGroupSubItem> {
|
||||
|
||||
}
|
||||
+12
@@ -1,5 +1,8 @@
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.project.VO.PayWorkingGroupVO;
|
||||
import com.jero.project.service.IPayWorkingGroupService;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.jero.project.mapper.PayWorkingGroupMapper;
|
||||
@@ -7,6 +10,8 @@ import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
|
||||
/**
|
||||
* @Description: pay_working_group
|
||||
@@ -16,4 +21,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
*/
|
||||
@Service
|
||||
public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMapper, PayWorkingGroup> implements IPayWorkingGroupService {
|
||||
|
||||
@Resource
|
||||
private PayWorkingGroupMapper payWorkingGroupMapper;
|
||||
@Override
|
||||
public IPage<PayWorkingGroupVO> queryPageList(Page<PayWorkingGroupVO> page, PayWorkingGroup payWorkingGroup) {
|
||||
return payWorkingGroupMapper.queryPageList(page,payWorkingGroup);
|
||||
}
|
||||
}
|
||||
|
||||
+19
@@ -0,0 +1,19 @@
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.jero.project.service.IPayWorkingGroupSubItemService;
|
||||
import com.jero.project.entity.PayWorkingGroupSubItem;
|
||||
import com.jero.project.mapper.PayWorkingGroupSubItemMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: pay_working_group_subitem
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-27
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGroupSubItemMapper, PayWorkingGroupSubItem> implements IPayWorkingGroupSubItemService {
|
||||
|
||||
}
|
||||
-19
@@ -1,19 +0,0 @@
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.jero.project.service.IPayWorkingGroupSubitemService;
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.mapper.PayWorkingGroupSubitemMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
/**
|
||||
* @Description: pay_working_group_subitem
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-27
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class PayWorkingGroupSubitemServiceImpl extends ServiceImpl<PayWorkingGroupSubitemMapper, PayWorkingGroupSubitem> implements IPayWorkingGroupSubitemService {
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user