收款单 采购单

src/main/java/org/jeecg/common/dto/archives/ProBusinessOtherAddReqDTO.java

@@ -22,6 +22,8 @@ public class ProBusinessOtherAddReqDTO {
     private String muilesId;
     @ApiModelProperty( "里程碑名称")
     private String muilesName;
+    @ApiModelProperty( "里程碑编码")
+    private String muilesCode;
     @ApiModelProperty( "开始时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

src/main/java/org/jeecg/common/dto/archives/ProBusinessOtherListRespDTO.java

@@ -33,6 +33,8 @@ public class ProBusinessOtherListRespDTO {
     private String muilesId;
     @ApiModelProperty( "里程碑名称")
     private String muilesName;
+    @ApiModelProperty( "里程碑编码")
+    private String muilesCode;
     @ApiModelProperty( "开始时间")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -75,6 +77,7 @@ public class ProBusinessOtherListRespDTO {
         this.executorId = other.getExecutorId();
         this.realTime = other.getRealTime();
         this.title = other.getMuilesName();
+        this.muilesCode=other.getMuilesCode();
         this.isLeaf = false;
         this.executors = executorIdList;
     }
@@ -174,4 +177,12 @@ public class ProBusinessOtherListRespDTO {
     public void setIsLeaf(boolean leaf) {
         isLeaf = leaf;
     }
+
+    public String getMuilesCode() {
+        return muilesCode;
+    }
+
+    public void setMuilesCode(String muilesCode) {
+        this.muilesCode = muilesCode;
+    }
 }

src/main/java/org/jeecg/modules/archives/entity/ProjectManageBusinessOther.java

@@ -36,6 +36,8 @@ public class ProjectManageBusinessOther implements Serializable {
 	private String muilesId;
 	@ApiModelProperty( "里程碑名称")
 	private String muilesName;
+	 @ApiModelProperty( "里程碑编码")
+	 private String muilesCode;
 	@ApiModelProperty( "开始时间")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -95,6 +97,7 @@ public class ProjectManageBusinessOther implements Serializable {
 		 this.realTime = plan.getRealTime();
 		 this.delFlag = "0";
 		 this.pkOrg = pkOrg;
+		 this.muilesCode = plan.getMuilesCode();
 	 }
 
 	 /**

src/main/java/org/jeecg/modules/basedata/controller/FdPersonnelController.java

@@ -187,10 +187,10 @@ public class FdPersonnelController {
             queryWrapper.like("p.name",name);
         }
         if(StringUtils.isNotBlank(pkDepart)){
-            queryWrapper.eq("p.pk_depart",pkDepart);
+            queryWrapper.like("p.pk_depart",pkDepart);
         }
         if(StringUtils.isNotBlank(pkOrg)){
-            queryWrapper.eq("p.pk_org",pkOrg);
+            queryWrapper.like("p.pk_org",pkOrg);
         }
         queryWrapper.orderByDesc("p.create_time");
         Page<FdPersonnel> page = new Page<FdPersonnel>(pageNo, pageSize);
@@ -353,7 +353,7 @@ public class FdPersonnelController {
                 if(!tree.getIsLeaf()) {
                     getTreeList(treeList, bmlist, tree);
                 }
-            }else if(tempPid != null && tempPid.equals(temp.getValue())){
+            }else if(tempPid != null && tempPid.indexOf(temp.getValue())!=-1){
                 temp.getChildren().add(tree);
                 if(!tree.getIsLeaf()) {
                     getTreeList(treeList, bmlist, tree);

src/main/java/org/jeecg/modules/basedata/entity/FdPersonnel.java

@@ -58,6 +58,12 @@ public class FdPersonnel implements Serializable {
 	/**所属公司*/
 	@Excel(name = "所属公司", width = 15)
 	private java.lang.String pkOrg;
+	/**所属部门名称*/
+	@Excel(name = "所属部门", width = 15)
+	private java.lang.String pkDepartName;
+	/**所属公司名称*/
+	@Excel(name = "所属公司", width = 15)
+	private java.lang.String pkOrgName;
 	/**人员状态，参照数据字典*/
 	@Excel(name = "人员状态，参照数据字典", width = 15)
 	@NotEmpty(message = "人员状态不能为空")

src/main/java/org/jeecg/modules/basedata/mapper/xml/FdPersonnelMapper.xml

@@ -79,8 +79,10 @@
             p.email,
             p. STATUS,
             p. ENABLE,
-            d.depart_name as departName,
-            c.depart_name as orgName,
+           <!-- d.depart_name as departName,
+            c.depart_name as orgName,-->
+            p.pk_org_name as orgName,
+            p.pk_depart_name as departName,
             p2.name as namePersonnel
         FROM
           fd_personnel p
@@ -146,6 +148,9 @@
             LEFT JOIN sys_user su ON su.personnel_id = a.id AND su.del_flag=0
         WHERE
             a.del_flag = 0
+            <if test="pkOrg !=null and pkOrg!='' and pkOrg!='null' ">
+                AND a.pk_org like CONCAT(CONCAT('%', #{pkOrg}), '%')
+            </if>
             AND TRIM( a.id ) != '' UNION
         SELECT
             sd.id AS id,
@@ -157,6 +162,9 @@
             LEFT JOIN sys_depart sd ON sd.id = a.pk_depart
         WHERE
             a.del_flag = 0
+            <if test="pkOrg !=null and pkOrg!='' and pkOrg!='null' ">
+                AND a.pk_org like CONCAT(CONCAT('%', #{pkOrg}), '%')
+            </if>
             AND TRIM( sd.id ) != '' UNION
         SELECT
             sd.id AS id,
@@ -168,8 +176,8 @@
             LEFT JOIN sys_depart sd ON a.pk_org = sd.id
         WHERE
             a.del_flag = 0
-            <if test="pkOrg !=null and pkOrg!=''">
-                AND a.pk_org =#{pkOrg}
+            <if test="pkOrg !=null and pkOrg!='' and pkOrg!='null' ">
+                AND a.pk_org like CONCAT(CONCAT('%', #{pkOrg}), '%')
             </if>
             AND TRIM( sd.id ) != ''
             ) t1

src/main/java/org/jeecg/modules/expense/controller/ReExpenseSlipController.java

@@ -125,7 +125,7 @@ public class ReExpenseSlipController {
 			@ApiImplicitParam(name="id", value="id",required=false, dataType="String"),
 	})
 	@DeleteMapping(value = "/delete")
-	public Result<ReExpenseSlip> delete(@RequestBody ExpenseSlipReqDTO  reqDTO) {
+	public Result<ReExpenseSlip> delete(ExpenseSlipReqDTO  reqDTO) {
 		Result<ReExpenseSlip> result = new Result<ReExpenseSlip>();
 		ReExpenseSlip reExpenseSlip = reExpenseSlipService.getById(reqDTO.getId());
 		if(reExpenseSlip==null) {

src/main/java/org/jeecg/modules/payment/service/impl/ManagerPaymentAndReceiptSlipServiceImpl.java

@@ -174,6 +174,7 @@ public class ManagerPaymentAndReceiptSlipServiceImpl extends ServiceImpl<Manager
         int sort = 1;
         for(SlipContentAddReqDTO reqDTO : slipAddReqDTO.getDetailList()){
             ManagePaymentAndReceiptContent content = new ManagePaymentAndReceiptContent(reqDTO);
+            content.setId(null);
             content.setSlipId(id);
             content.setSort(sort++);
             list.add(content);