Browse Source

更改

master
ligaode 2 months ago
parent
commit
bfe725eb19
  1. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  2. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml
  3. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccomm.java
  4. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommDetailsVo.java
  5. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommDto.java
  6. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommVo.java
  7. 3
      yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccommdetail/AsServiceAccommDetail.java
  8. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccommdetail/AsServiceAccommDetailDetailsVo.java
  9. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccommdetail/AsServiceAccommDetailDto.java
  10. 7
      yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitle.java
  11. 7
      yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDetailsVo.java
  12. 6
      yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDto.java
  13. 2
      yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleVo.java
  14. 10
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommMapper.java
  15. 14
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommRest.java
  16. 13
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommService.java
  17. 14
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyRest.java
  18. 14
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyService.java
  19. 8
      yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java
  20. 15
      yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.xml
  21. 12
      yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java
  22. 54
      yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java
  23. 15
      yxt-crm-biz/src/main/java/com/yxt/crm/feign/flowable/flow/ProcDefEnum.java
  24. 9
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java
  25. 105
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdLeasehostApplyRest.java
  26. 36
      yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdLeasehostDetailRest.java
  27. 58
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApply.java
  28. 65
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyDetailsVo.java
  29. 54
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyDto.java
  30. 35
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyMapper.java
  31. 9
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyMapper.xml
  32. 307
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java
  33. 77
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyVo.java
  34. 72
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetail.java
  35. 56
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailDto.java
  36. 41
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailMapper.java
  37. 18
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailMapper.xml
  38. 64
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailService.java
  39. 72
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailVo.java
  40. 52
      yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostListDetailVo.java
  41. 13
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java
  42. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -139,8 +139,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignPor;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private BaseVehicleService baseVehicleService;
@ -547,7 +545,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
try {
//推送金蝶销售出库单
createSalOutStock(baseAccadjApply);
//createSalOutStock(baseAccadjApply);
//关联查询调车车辆列表中的采购部门sid
List<String> stringList = baseAccadjApplyeVehService.fetchCallInBuyerOrgSidByMainSid(baseAccadjApply.getSid());
List<BaseAccadjApplyToJDRu> baseAccadjApplyToJDRus = new ArrayList<>();

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml

@ -463,6 +463,7 @@
'%'
)
AND sur.roleSid = 'de8bfb73-8a08-46bc-beab-f981bf8c8de8'
AND st.personTypeKey != '01'
</select>
<select id="getAllPeo" resultType="com.yxt.anrui.portal.api.sysuser.DeptUserVo">

3
yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccomm.java

@ -68,5 +68,6 @@ public class AsServiceAccomm extends BaseEntity {
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("是否曾备案")
private Integer isBa;
}

3
yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommDetailsVo.java

@ -73,5 +73,6 @@ public class AsServiceAccommDetailsVo implements Vo {
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("是否曾备案")
private Integer isBa;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommDto.java

@ -75,4 +75,6 @@ public class AsServiceAccommDto implements Dto {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("是否曾备案")
private Integer isBa;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccomm/AsServiceAccommVo.java

@ -67,4 +67,6 @@ public class AsServiceAccommVo implements Vo {
private String remarks;
@ApiModelProperty("排序")
private Integer sortNo;
@ApiModelProperty("是否曾备案")
private Integer isBa;
}

3
yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccommdetail/AsServiceAccommDetail.java

@ -60,5 +60,6 @@ public class AsServiceAccommDetail extends BaseEntity {
private String postName; // 岗位名称
@ApiModelProperty("提成比例")
private BigDecimal commRatio; // 提成比例
@ApiModelProperty("管理sid")
private String accommSid;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccommdetail/AsServiceAccommDetailDetailsVo.java

@ -63,4 +63,6 @@ public class AsServiceAccommDetailDetailsVo implements Vo {
private BigDecimal commRatio; // 提成比例
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("管理sid")
private String accommSid;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/asserviceaccommdetail/AsServiceAccommDetailDto.java

@ -63,4 +63,6 @@ public class AsServiceAccommDetailDto implements Dto {
private BigDecimal commRatio; // 提成比例
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("管理sid")
private String accommSid;
}

7
yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitle.java

@ -56,6 +56,10 @@ public class AsTechTitle extends BaseEntity {
private String titleNameValue;
@ApiModelProperty("权重")
private String weight; // 权重
@ApiModelProperty("维修技师sid")
private String techSid;
@ApiModelProperty("维修技师姓名")
private String techName;
@ApiModelProperty("排序")
private Integer sortNo; // 排序
@ApiModelProperty("部门sid")
@ -66,5 +70,6 @@ public class AsTechTitle extends BaseEntity {
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("是否曾备案")
private Integer isBa;
}

7
yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDetailsVo.java

@ -61,6 +61,10 @@ public class AsTechTitleDetailsVo implements Vo {
private String titleNameValue;
@ApiModelProperty("权重")
private String weight; // 权重
@ApiModelProperty("维修技师sid")
private String techSid;
@ApiModelProperty("维修技师姓名")
private String techName;
@ApiModelProperty("排序")
private Integer sortNo; // 排序
@ApiModelProperty("部门sid")
@ -71,5 +75,6 @@ public class AsTechTitleDetailsVo implements Vo {
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty("是否曾备案")
private Integer isBa;
}

6
yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleDto.java

@ -61,6 +61,10 @@ public class AsTechTitleDto implements Dto {
private String titleNameValue;
@ApiModelProperty("权重")
private String weight; // 权重
@ApiModelProperty("维修技师sid")
private String techSid;
@ApiModelProperty("维修技师姓名")
private String techName;
@ApiModelProperty("排序")
private Integer sortNo; // 排序
@ApiModelProperty("部门sid")
@ -73,4 +77,6 @@ public class AsTechTitleDto implements Dto {
private String createOrgSid; // 创建组织sid
@ApiModelProperty("组织全路径")
private String orgPath;
@ApiModelProperty("是否曾备案")
private Integer isBa;
}

2
yxt-as/src/main/java/com/yxt/anrui/as/api/astechtitle/AsTechTitleVo.java

@ -63,6 +63,8 @@ public class AsTechTitleVo implements Vo {
private String remarks;
@ApiModelProperty("维修技师")
private String techName;
@ApiModelProperty("是否曾备案")
private Integer isBa;
@ApiModelProperty("排序")
private Integer sortNo;
}

10
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommMapper.java

@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import com.yxt.anrui.as.api.asserviceaccomm.AsServiceAccomm;
import com.yxt.anrui.as.api.asserviceaccomm.AsServiceAccommVo;
import org.apache.ibatis.annotations.Update;
import java.util.List;
@ -54,4 +55,13 @@ import java.util.List;
public interface AsServiceAccommMapper extends BaseMapper<AsServiceAccomm> {
IPage<AsServiceAccommVo> selectPageVo(IPage<AsServiceAccomm> page, @Param(Constants.WRAPPER) Wrapper<AsServiceAccomm> qw);
@Update("update as_service_accomm set state = #{state} where sid = #{sid}")
void updateState(@Param("sid") String sid,@Param("state") Integer state);
@Update("update as_service_accomm set isBa = #{isBa} where sid = #{sid}")
void updateIsBa(@Param("sid") String sid,@Param("isBa") Integer isBa);
@Update("update as_service_accomm set commRatio = #{commRatio} where sid = #{sid}")
void updateCommRatio(@Param("sid") String sid,@Param("commRatio") String commRatio);
}

14
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommRest.java

@ -32,25 +32,11 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.yxt.anrui.as.api.asserviceaccomm.AsServiceAccommQuery;
import com.yxt.anrui.as.api.asserviceaccomm.AsServiceAccommVo;
import com.yxt.anrui.as.api.asserviceaccomm.AsServiceAccommDetailsVo;
import com.yxt.anrui.as.api.asserviceaccomm.AsServiceAccommDto;
/**
* Project: yxt-as(销售配件提成) <br/>
* File: AsServiceAccommFeignFallback.java <br/>
* Class: com.yxt.anrui.as.biz.asserviceaccomm.AsServiceAccommRest <br/>
* Description: 配件销售提成. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-30 09:09:58 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "配件销售提成")
@RestController
@RequestMapping("v1/asserviceaccomm")

13
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccomm/AsServiceAccommService.java

@ -49,6 +49,7 @@ import com.yxt.anrui.as.api.asserviceaccomm.AsServiceAccommDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.List;
@ -185,4 +186,16 @@ public class AsServiceAccommService extends MybatisBaseService<AsServiceAccommMa
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void updateState(String sid, Integer state) {
baseMapper.updateState(sid, state);
}
public void updateIsBa(String sid, Integer isBa) {
baseMapper.updateIsBa(sid, isBa);
}
public void updateCommRatio(String sid, String commRatio) {
baseMapper.updateCommRatio(sid, commRatio);
}
}

14
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyRest.java

@ -26,7 +26,6 @@
package com.yxt.anrui.as.biz.asserviceaccommapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.as.api.asbwinvoiceapply.flowable.*;
import com.yxt.anrui.as.api.asserviceaccommapply.flowable.*;
import com.yxt.anrui.as.feign.flowable.flow.BusinessVariables;
import com.yxt.common.core.query.PagerQuery;
@ -46,19 +45,6 @@ import com.yxt.anrui.as.api.asserviceaccommapply.AsServiceAccommApplyDto;
import javax.validation.Valid;
import java.util.List;
/**
* Project: yxt-as(销售配件提成) <br/>
* File: AsServiceAccommApplyFeignFallback.java <br/>
* Class: com.yxt.anrui.as.biz.asserviceaccommapply.AsServiceAccommApplyRest <br/>
* Description: 配件销售提成备案. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-30 09:09:58 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "配件销售提成备案")
@RestController
@RequestMapping("v1/asserviceaccommapply")

14
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceaccommapply/AsServiceAccommApplyService.java

@ -41,6 +41,7 @@ import com.yxt.anrui.as.api.asserviceaccommapply.flowable.*;
import com.yxt.anrui.as.api.asserviceaccommdetail.AsServiceAccommDetailDetailsVo;
import com.yxt.anrui.as.api.asserviceaccommdetail.AsServiceAccommDetailDto;
import com.yxt.anrui.as.biz.asappendix.AsAppendixService;
import com.yxt.anrui.as.biz.asserviceaccomm.AsServiceAccommService;
import com.yxt.anrui.as.biz.asserviceaccommdetail.AsServiceAccommDetailService;
import com.yxt.anrui.as.feign.base.billno.Rule;
import com.yxt.anrui.as.feign.file.AsFileEnum;
@ -102,6 +103,8 @@ public class AsServiceAccommApplyService extends MybatisBaseService<AsServiceAcc
@Autowired
private AsServiceAccommDetailService asServiceAccommDetailService;
@Autowired
private AsServiceAccommService asServiceAccommService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private AsAppendixService asAppendixService;
@ -327,6 +330,10 @@ public class AsServiceAccommApplyService extends MybatisBaseService<AsServiceAcc
UpdateFlowFieldVo ufVo = voResultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(ufVo));
asServiceAccommApply = fetchBySid(businessSid);
List<AsServiceAccommDetailDto> asServiceAccommDetailList = dto.getAsServiceAccommDetailList();
for (AsServiceAccommDetailDto asServiceAccommDetailDto : asServiceAccommDetailList) {
asServiceAccommService.updateState(asServiceAccommDetailDto.getAccommSid(), 2);
}
//==================================添加线程
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@ -416,7 +423,12 @@ public class AsServiceAccommApplyService extends MybatisBaseService<AsServiceAcc
UpdateFlowFieldVo ufVo = resultBean.getData();
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<AsServiceAccommDetailDetailsVo> asServiceAccommDetailDetailsVos = asServiceAccommDetailService.selByMainSid(businessSid);
for (AsServiceAccommDetailDetailsVo asServiceAccommDetailDetailsVo : asServiceAccommDetailDetailsVos) {
asServiceAccommService.updateState(asServiceAccommDetailDetailsVo.getAccommSid(), 0);
asServiceAccommService.updateIsBa(asServiceAccommDetailDetailsVo.getAccommSid(), 1);
asServiceAccommService.updateCommRatio(asServiceAccommDetailDetailsVo.getAccommSid(),asServiceAccommDetailDetailsVo.getCommRatio().toString());
}
} else {
//极光推送
asServiceAccommApply = fetchBySid(businessSid);

8
yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.java

@ -71,4 +71,12 @@ public interface AsTechTitleMapper extends BaseMapper<AsTechTitle> {
@Update("update as_tech_title set state = #{state} where sid = #{sid}")
void updateState(@Param("sid") String sid, @Param("state") String state);
@Update("update as_tech_title set techSid = #{techSid},techName = #{techName} where sid = #{sid}")
void updateTech(@Param("sid") String sid, @Param("techSid") String techSid, @Param("techName") String techName);
@Update("update as_tech_title set isBa = #{isBa} where sid = #{sid}")
void updateIsBa(@Param("sid")String sid,@Param("isBa") Integer isBa);
AsTechTitle selLikeTechSid(String techSid);
}

15
yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleMapper.xml

@ -5,14 +5,19 @@
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.as.api.astechtitle.AsTechTitleVo">
SELECT
att.*,
attd.techName
att.*
FROM
as_tech_title att
LEFT JOIN anrui_portal.sys_organization AS s
ON att.useOrgSid = s.sid
LEFT JOIN as_tech_title_detail attd
ON att.sid = attd.titleSid
<where> ${ew.sqlSegment} </where>
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selLikeTechSid" resultType="com.yxt.anrui.as.api.astechtitle.AsTechTitle">
SELECT *
FROM as_tech_title
WHERE techSid LIKE CONCAT('%', #{techSid}, '%')
</select>
</mapper>

12
yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitle/AsTechTitleService.java

@ -229,4 +229,16 @@ public class AsTechTitleService extends MybatisBaseService<AsTechTitleMapper, As
public void updateState(String sid, String state) {
baseMapper.updateState(sid, state);
}
public void updateTech(String sid, String techSid, String techName) {
baseMapper.updateTech(sid, techSid, techName);
}
public void updateIsBa(String sid, Integer isBa) {
baseMapper.updateIsBa(sid, isBa);
}
public AsTechTitle selLikeTechSid(String techSid) {
return baseMapper.selLikeTechSid(techSid);
}
}

54
yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java

@ -28,6 +28,7 @@ package com.yxt.anrui.as.biz.astechtitleapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@ -62,6 +63,7 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign;
import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo;
import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.core.result.ResultBean;
@ -316,13 +318,6 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
asTechTitleDetailDetailsVo.setTitleNameKey(asTechTitle.getTitleNameKey());
asTechTitleDetailDetailsVo.setTitleNameValue(asTechTitle.getTitleNameValue());
asTechTitleDetailDetailsVo.setWeight(asTechTitle.getWeight());
AsTechTitleInit asTechTitleInit = asTechTitleDetailService.selByTechSid(techSid);
if (asTechTitleInit != null){
if (StringUtils.isNotBlank(asTechTitleInit.getTechSids())){
asTechTitleDetailDetailsVo.setTechSids(Arrays.asList(asTechTitleInit.getTechSids().split(",")));
asTechTitleDetailDetailsVo.setTechNames(Arrays.asList(asTechTitleInit.getTechNames().split(",")));
}
}
asTechTitleDetailDetailsVos.add(asTechTitleDetailDetailsVo);
}
asTechTitleApplyDetailsVo.setAsTechTitleDetailDetailsList(asTechTitleDetailDetailsVos);
@ -471,7 +466,43 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
//办结后修改职称管理中备案状态为已备案
List<AsTechTitleDetailDetailsVo> asTechTitleDetailDetailsVos = asTechTitleDetailService.selByMainSid(businessSid);
for (AsTechTitleDetailDetailsVo asTechTitleDetailDetailsVo : asTechTitleDetailDetailsVos) {
AsTechTitleDetail asTechTitleDetail = asTechTitleDetailService.fetchBySid(asTechTitleDetailDetailsVo.getSid());
String techSid = asTechTitleDetail.getTechSid();
String techName = asTechTitleDetail.getTechName();
asTechTitleDetailDetailsVo.setTechSids(Arrays.asList(techSid.split(",")));
asTechTitleDetailDetailsVo.setTechNames(Arrays.asList(techName.split(",")));
List<String> glTechSids = new ArrayList<>();
List<String> glTechNames = new ArrayList<>();
AsTechTitle asTechTitle = asTechTitleService.fetchBySid(asTechTitleDetailDetailsVo.getTitleSid());
if (StringUtils.isNotBlank(asTechTitle.getTechSid())) {
glTechSids = Arrays.asList(asTechTitle.getTechSid().split(","));
}
List<String> techSids = asTechTitleDetailDetailsVo.getTechSids();
List<String> cyTechSids = (List<String>) CollectionUtils.subtract(techSids, glTechSids);
glTechSids.addAll(cyTechSids);
Iterator<String> iterator = glTechSids.iterator();
while (iterator.hasNext()){
String next = iterator.next();
SysUserVo userVo = sysUserFeign.fetchBySid(next).getData();
List<String> roleSids = sysUserRoleFeign.getUserRoleSidByUserSid(next).getData();
if (roleSids.contains("de8bfb73-8a08-46bc-beab-f981bf8c8de8")){
AsTechTitle asTechTitle1 = asTechTitleService.selLikeTechSid(next);
if (asTechTitle1 != null){
List<String> sids = Arrays.asList(asTechTitle.getTechSid());
List<String> names = Arrays.asList(asTechTitle.getTechName());
sids.remove(next);
names.remove(userVo.getName());
asTechTitleService.updateTech(asTechTitle1.getSid(), StringUtils.join(sids, ","), StringUtils.join(names, ","));
}
glTechNames.add(userVo.getName());
}else {
glTechSids.remove(next);
continue;
}
}
asTechTitleService.updateTech(asTechTitleDetailDetailsVo.getTitleSid(), StringUtils.join(glTechSids, ","), StringUtils.join(glTechNames, ","));
asTechTitleService.updateState(asTechTitleDetailDetailsVo.getTitleSid(), "0");
asTechTitleService.updateIsBa(asTechTitleDetailDetailsVo.getTitleSid(), 1);
}
} else {
//极光推送
@ -495,6 +526,15 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
}
}
public static void main(String[] args) {
List<String> glTechSids = Arrays.asList("li","wang","tt");
List<String> techSids = Arrays.asList("li","pp");
List<String> cyTechSids = (List<String>) CollectionUtils.subtract(techSids, glTechSids);
System.out.println("差集为:" + cyTechSids);
}
public ResultBean<List<TechTitleApplyNodeVo>> getPreviousNodesForReject(TechTitleApplyNodeQuery query) {
ResultBean<List<TechTitleApplyNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();

15
yxt-crm-biz/src/main/java/com/yxt/crm/feign/flowable/flow/ProcDefEnum.java

@ -7,22 +7,7 @@ public enum ProcDefEnum {
/***************************正式流程id***********************************/
ASARREARSOUTAPPLY("欠款出厂申请", "process_d0eyl7ep:2:14197520"),
ASOLDPARTRETURNAPPLY("旧件返厂申请", "process_9ijbdmdb:1:14177556"),
ASOLDPARTHANDLEAPPLY("旧件处理申请", "process_hxr0wezs:1:14177560"),
REVERSESETTLEAPPLY("工单反结算申请", "process_g3r02po8:3:14197552"),
ASBUSCLAIMINVOICEBILL("索赔单开票申请", "process_czty2ysj:2:14197524"),
ASBUSCLAIMCHECKAPPLY("索赔单调整申请", "process_i6ln3qcd:2:14197528"),
ASBWDIFFAPPLY("工单应收调差申请", "process_b1thoh6n:2:14197532"),
ASBWINVOICEAPPLY("工单开票申请", "process_ldw1bs5t:1:14197536"),
ASTECHTITLEAPPLY("维修技师职称备案申请", "process_kl8rqdjf:1:14197604"),
BILLSETTLEAPPLY("工单结算申请", "process_q2p7s99n:2:14900004"),
ASHOSESUPPAPPLY("工时提成抵顶配件费用申请", "process_z2d1n43e:1:14197592"),
ASSERVICEITEMAPPLY("维修项目备案申请", "process_mbiz75zg:1:14197572"),
ASSERVICEACCOMMAPPLY("配件销售提成备案申请", "process_89i56wrn:1:14197576"),
ASSTANDRECORDAPPLY("合作二级站备案申请", "process_e5yugvlx:2:14197596"),
ENTERPRISEAPPLY("定点企业备案", "process_tvywp9ri:2:14197516"),
;

9
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdExpatriatesApplyRest.java

@ -26,25 +26,16 @@
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adexpatriatesapply.*;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDetailVo;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyDto;
import com.yxt.anrui.oa.biz.hrhireapply.HrHireApplyVo;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeVo;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.anrui.oa.biz.oamendapply.OaMendApplyDto;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
@Api(tags = "驻外人员认定申请")
@RestController

105
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdLeasehostApplyRest.java

@ -0,0 +1,105 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.api;
import com.yxt.anrui.oa.biz.adexpatriatesapply.AdExpatriatesApplyDto;
import com.yxt.anrui.oa.biz.adleasehostapply.*;
import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto;
import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery;
import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
@Api(tags = "宿舍租赁申请")
@RestController
@RequestMapping("v1/adleasehostapply")
public class AdLeasehostApplyRest {
@Autowired
private AdLeasehostApplyService adLeasehostApplyService;
@ApiOperation("初始化(新增或修改)")
@GetMapping({"/getInit", "/getInit/{sid}"})
public ResultBean<AdLeasehostApplyVo> getInit(
@PathVariable(value = "sid", required = false) String sid,
@RequestParam(value = "userSid", required = false) String userSid,
@RequestParam(value = "orgPath", required = false) String orgPath) {
ResultBean<AdLeasehostApplyVo> rb = ResultBean.fireFail();
if (sid == null || sid.isEmpty()) {
// 执行新增初始化
if (userSid == null || orgPath == null) {
return rb.setMsg("userSid和orgPath不能为空");
}
return adLeasehostApplyService.getSaveInit(userSid, orgPath);
} else {
// 执行修改初始化
return adLeasehostApplyService.getUpdateInit(sid);
}
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody AdLeasehostApplyDto dto) {
return adLeasehostApplyService.saveOrUpdateDto(dto);
}
@ApiOperation("详情")
@GetMapping("/details/{sid}")
ResultBean<AdLeasehostApplyDetailsVo> details(@PathVariable("sid") String sid
, @RequestParam(value = "application", required = false) String application) {
return adLeasehostApplyService.details(sid,application);
}
@ApiOperation("提交审批流程")
@PostMapping("/submit")
public ResultBean submit(@RequestBody AdLeasehostApplyDto dto) {
return adLeasehostApplyService.submit(dto);
}
@ApiOperation(value = "办理(同意)")
@PutMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
return adLeasehostApplyService.complete(dto);
}
@ApiOperation(value = "驳回任务")
@PutMapping(value = "/reject")
public ResultBean reject(@Valid @RequestBody TaskDto dto) {
return adLeasehostApplyService.reject(dto);
}
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
return adLeasehostApplyService.getFlowOperateTitle(query);
}
}

36
yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdLeasehostDetailRest.java

@ -0,0 +1,36 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.api;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;
@Api(tags = "宿舍租赁列表")
@RestController
@RequestMapping("v1/adleasehostdetail")
public class AdLeasehostDetailRest {
}

58
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApply.java

@ -0,0 +1,58 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostapply;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-oa(宿舍租赁) <br/>
* File: AdLeasehostApply.java <br/>
* Class: com.yxt.anrui.oa.api.adleasehostapply.AdLeasehostApply <br/>
* Description: 宿舍租赁申请. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2025-02-17 14:11:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "宿舍租赁申请", description = "宿舍租赁申请")
@TableName("ad_leasehost_apply")
public class AdLeasehostApply extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("基础表单sid")
private String formSid; // 基础表单sid
@ApiModelProperty("关联审批sid列表,英文逗号分隔")
private String linkFormSids; // 关联审批sid列表,英文逗号分隔
}

65
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyDetailsVo.java

@ -0,0 +1,65 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostapply;
import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesListDetailVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: yxt-oa(宿舍租赁) <br/>
* File: AdLeasehostApplyVo.java <br/>
* Class: com.yxt.anrui.oa.api.adleasehostapply.AdLeasehostApplyVo <br/>
* Description: 宿舍租赁申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2025-02-17 14:11:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "宿舍租赁申请 视图数据详情", description = "宿舍租赁申请 视图数据详情")
public class AdLeasehostApplyDetailsVo implements Vo {
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("附件")
private List<String> appes = new ArrayList<>();
private List<AdExpatriatesListDetailVo> list = new ArrayList<>();
}

54
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyDto.java

@ -0,0 +1,54 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostapply;
import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailDto;
import com.yxt.anrui.oa.biz.oaform.OaFormDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@ApiModel(value = "宿舍租赁申请 数据传输对象", description = "宿舍租赁申请 数据传输对象")
public class AdLeasehostApplyDto extends OaFormDto {
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("基础表单sid")
private String formSid;
@ApiModelProperty("关联审批单")
private String linkFormSids;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("文件")
private List<String> appes = new ArrayList<>();
private List<AdLeasehostDetailDto> list = new ArrayList<>();
}

35
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyMapper.java

@ -0,0 +1,35 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostapply;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface AdLeasehostApplyMapper extends BaseMapper<AdLeasehostApply> {
AdLeasehostApplyDetailsVo details(String sid);
}

9
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyMapper.xml

@ -0,0 +1,9 @@
<?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.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="details" resultType="com.yxt.anrui.oa.biz.adleasehostapply.AdLeasehostApplyDetailsVo">
</select>
</mapper>

307
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyService.java

@ -0,0 +1,307 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailDto;
import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailService;
import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo;
import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService;
import com.yxt.anrui.oa.biz.oaform.*;
import com.yxt.anrui.oa.biz.oaform.flowable.*;
import com.yxt.anrui.oa.feign.file.OaFileEnum;
import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum;
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.core.result.ResultBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class AdLeasehostApplyService extends MybatisBaseService<AdLeasehostApplyMapper, AdLeasehostApply> {
@Autowired
private OaAppendixService oaAppendixService;
@Autowired
private OaFormService oaFormService;
@Autowired
private AdLeasehostDetailService adLeasehostDetailService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public ResultBean<AdLeasehostApplyVo> getSaveInit(String userSid, String orgPath) {
ResultBean<AdLeasehostApplyVo> rb = ResultBean.fireFail();
AdLeasehostApplyVo adLeasehostApplyVo = new AdLeasehostApplyVo();
adLeasehostApplyVo.setCreateBySid(userSid);
adLeasehostApplyVo.setOrgSidPath(orgPath);
return rb.success().setData(adLeasehostApplyVo);
}
public ResultBean<AdLeasehostApplyVo> getUpdateInit(String sid) {
ResultBean<AdLeasehostApplyVo> rb = ResultBean.fireFail();
AdLeasehostApplyVo adLeasehostApplyVo = new AdLeasehostApplyVo();
AdLeasehostApply adLeasehostApply = fetchBySid(sid);
if (adLeasehostApply == null) {
return rb.setMsg("该申请不存在");
}
// adExpatriatesApplyVo.setTestPage(adExpatriatesApply.getTestPage());
OaForm oaForm = oaFormService.fetchBySid(sid);
adLeasehostApplyVo.setTaskId(oaForm.getTaskId());
adLeasehostApplyVo.setProcInsId(oaForm.getProcInstId());
//根据部门sid获取orgPath并赋值
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
String orgSidPath = organizationVo.getOrgSidPath();
adLeasehostApplyVo.setOrgSidPath(orgSidPath);
adLeasehostApplyVo.setCreateBySid(oaForm.getCreateBySid());
BeanUtil.copyProperties(adLeasehostApply, adLeasehostApplyVo);
List<AdLeasehostDetailVo> list = adLeasehostDetailService.getUpdateInit(sid);
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
list.stream().forEach(details -> {
FormCommon housingTypeObj = FormCommon.of(details.getHousingTypeKey(), details.getHousingTypeValue());
details.setHousingTypeObj(housingTypeObj);
});
}
List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
adLeasehostApplyVo.setFiles(files);
List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
adLeasehostApplyVo.setAppes(appes);
adLeasehostApplyVo.setList(list);
adLeasehostApplyVo.setSid(sid);
return rb.success().setData(adLeasehostApplyVo);
}
public ResultBean<String> saveOrUpdateDto(AdLeasehostApplyDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
List<String> files = dto.getFiles();
List<String> appes = dto.getAppes();
List<AdLeasehostDetailDto> list = dto.getList();
if (StringUtils.isBlank(sid)) {
// 新建操作
AdLeasehostApply entity = new AdLeasehostApply();
BeanUtil.copyProperties(dto, entity, "sid");
dto.setBillNo("SSZLSQ");
dto.setSid(entity.getSid());
ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
if (!resultBean.getSuccess()) {
return rb;
}
entity.setFormSid(resultBean.getData());
baseMapper.insert(entity);
sid = entity.getSid();
} else {
// 更新操作
AdLeasehostApply entity = fetchBySid(sid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
adLeasehostDetailService.saveDetails(list, sid);
// 处理附件
saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
return rb.success().setData(sid);
}
// 保存文件
private void saveFiles(String sid, List<String> files, String attachType, String fileType) {
files.removeAll(Collections.singleton(null));
oaAppendixService.saveFile(sid, files, attachType, fileType);
}
public ResultBean<AdLeasehostApplyDetailsVo> details(String sid, String application) {
ResultBean rb = ResultBean.fireFail();
AdLeasehostApplyDetailsVo adLeasehostApplyDetailsVo = baseMapper.details(sid);
if (adLeasehostApplyDetailsVo == null) {
return rb.setMsg("该申请不存在");
}
List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
adLeasehostApplyDetailsVo.setFiles(files);
adLeasehostApplyDetailsVo.setAppes(appes);
//基础字段赋值
BeanUtil.copyProperties(oaFormService.getDetails(sid), adLeasehostApplyDetailsVo);
return rb.success().setData(adLeasehostApplyDetailsVo);
}
/**
* 提交
*
* @param dto
* @return
*/
public ResultBean submit(AdLeasehostApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
ResultBean<String> stringResultBean = saveOrUpdateDto(dto);
if (!stringResultBean.getSuccess()) {
return rb.setMsg(stringResultBean.getData());
}
String businessSid = stringResultBean.getData();
SubmitDto submitDto = new SubmitDto();
submitDto.setUserSid(dto.getCreateBySid());
submitDto.setBusinessSid(businessSid);
Map<String, Object> formVariables = new HashMap<>();
formVariables = getMap(formVariables, businessSid);
submitDto.setFormVariables(formVariables);
submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId());
submitDto.setNextTaskId(dto.getTaskId());
submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule());
return oaFormService.submit(submitDto);
}
/**
* 办理同意
*
* @param dto
* @return
*/
public ResultBean complete(CompleteDto dto) {
Map<String, Object> formVariables = dto.getFormVariables();
formVariables = getMap(formVariables, dto.getBusinessSid());
dto.setFormVariables(formVariables);
BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto();
BeanUtil.copyProperties(dto, businessVariablesDto);
return oaFormService.complete(businessVariablesDto);
}
/**
* 驳回
*
* @param dto
* @return
*/
public ResultBean reject(TaskDto dto) {
Map<String, Object> formVariables = dto.getFormVariables();
formVariables = getMap(formVariables, dto.getBusinessSid());
dto.setFormVariables(formVariables);
return oaFormService.reject(dto);
}
public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
// 默认失败返回
ResultBean<String> rb = ResultBean.fireFail();
// 获取next值和formVariables
int next = query.getNext();
// 获取并更新formVariables
Map<String, Object> formVariables = getMap(query.getFormVariables(), query.getBusinessSid());
query.setFormVariables(formVariables);
// 校验next参数是否有效(只允许0或1)
if (next != 0 && next != 1) {
return rb.setMsg("参数错误:next"); // 如果next不是0或1,返回错误信息
}
// 获取节点名称
String data = getNodeName(query, next);
// 如果data为null,表示未获取到有效的节点信息
if (data == null) {
return rb.setMsg("没有获取到节点信息"); // 返回错误消息
}
// 返回成功的结果和获取到的节点名称
return rb.success().setData(data);
}
/**
* 网关参数组成
*
* @param formVariables
* @param sid
* @return
*/
public Map<String, Object> getMap(Map<String, Object> formVariables, String sid) {
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", sid);
/*appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid);
appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid);
appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle");
appMap.put("agreeUrl", "oa/v1/HrHireApply/complete");
appMap.put("stopUrl", "oa/v1/oaform/breakProcess");
appMap.put("rejectUrl", "oa/v1/HrHireApply/reject");
appMap.put("recallUrl", "oa/v1/oaform/revokeProcess");
appMap.put("signUrl", "oa/v1/oaform/delegate");
appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/
appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid);
appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid);
appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl());
appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl());
appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl());
appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl());
appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl());
appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl());
appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl());
formVariables.put("app", appMap);
//根据组织查询是否是分公司
OaForm oaForm = oaFormService.fetchBySid(sid);
AdLeasehostApply adLeasehostApply = fetchBySid(sid);
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData();
//是否是分公司
formVariables.put("isTrue", sysOrganization.getIsDept() == 0);
return formVariables;
}
/**
* 根据next的值获取前一个节点或下一个节点的名称
*
* @param query 包含查询所需参数的NodeQuery对象
* @param next 参数0表示上一环节1表示下一环节
* @return 节点名称如果失败则返回null
*/
private String getNodeName(NodeQuery query, int next) {
// 根据next值选择相应的服务方法获取节点信息
ResultBean<List<NodeVo>> resultBean = (next == 0)
? oaFormService.getPreviousNodesForReject(query) // 获取上一环节的节点
: oaFormService.getNextNodesForSubmit(query); // 获取下一环节的节点
// 如果服务调用成功
if (resultBean.getSuccess()) {
// 清除结果列表中的null值,避免空节点
resultBean.getData().removeAll(Collections.singleton(null));
// 如果结果列表非空,返回第一个节点的名称
if (!resultBean.getData().isEmpty()) {
return resultBean.getData().get(0).getName();
}
} else {
// 如果服务调用失败,返回null
return null;
}
// 如果结果为空,返回null
return null;
}
}

77
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostapply/AdLeasehostApplyVo.java

@ -0,0 +1,77 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostapply;
import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo;
import com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* Project: yxt-oa(宿舍租赁) <br/>
* File: AdLeasehostApplyVo.java <br/>
* Class: com.yxt.anrui.oa.api.adleasehostapply.AdLeasehostApplyVo <br/>
* Description: 宿舍租赁申请 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2025-02-17 14:11:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "宿舍租赁申请 视图数据对象", description = "宿舍租赁申请 视图数据对象")
public class AdLeasehostApplyVo implements Vo {
private String sid;
/* private String userSid;
private String orgPath;*/
private String orgSidPath;
private String createBySid;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("图片")
private List<String> files = new ArrayList<>();
@ApiModelProperty("附件")
private List<String> appes = new ArrayList<>();
private List<AdLeasehostDetailVo> list = new ArrayList<>();
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
// private String testPage;
}

72
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetail.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostdetail;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-oa(宿舍租赁) <br/>
* File: AdLeasehostDetail.java <br/>
* Class: com.yxt.anrui.oa.api.adleasehostdetail.AdLeasehostDetail <br/>
* Description: 宿舍租赁列表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2025-02-17 14:11:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "宿舍租赁列表", description = "宿舍租赁列表")
@TableName("ad_leasehost_detail")
public class AdLeasehostDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("申请sid")
private String mainSid; // 申请sid
@ApiModelProperty("经办人")
private String operator; // 经办人
@ApiModelProperty("宿舍使用人")
private String dormitoryUser; // 宿舍使用人
@ApiModelProperty("房屋类型key")
private String housingTypeKey; // 房屋类型key
@ApiModelProperty("房屋类型value")
private String housingTypeValue; // 房屋类型value
@ApiModelProperty("房屋基本信息")
private String basicHousingInformation; // 房屋基本信息
@ApiModelProperty("租房预计费用")
private BigDecimal estimatedRentalCost; // 租房预计费用
@ApiModelProperty("租赁期限及租房押金、支付方式")
private String leaseTermAndDeposit; // 租赁期限及租房押金、支付方式
}

56
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailDto.java

@ -0,0 +1,56 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostdetail;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "宿舍租赁列表 数据传输对象", description = "宿舍租赁列表 数据传输对象")
public class AdLeasehostDetailDto implements Dto {
@ApiModelProperty("经办人")
private String operator;
@ApiModelProperty("宿舍使用人")
private String dormitoryUser;
@ApiModelProperty("房屋类型")
private FormCommon housingTypeObj;
private String housingTypeKey;
private String housingTypeValue;
@ApiModelProperty("房屋基本信息")
private String basicHousingInformation;
@ApiModelProperty("租房预计费用")
private BigDecimal estimatedRentalCost;
@ApiModelProperty("租赁期限及租房押金、支付方式")
private String leaseTermAndDeposit;
}

41
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailMapper.java

@ -0,0 +1,41 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostdetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@Mapper
public interface AdLeasehostDetailMapper extends BaseMapper<AdLeasehostDetail> {
List<AdLeasehostDetailVo> getUpdateInit(String sid);
@Select("select * from ad_leasehost_detail where mainSid = #{mainSid}")
List<AdLeasehostDetail> selectByMainSid(String mainSid);
}

18
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailMapper.xml

@ -0,0 +1,18 @@
<?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.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adleasehostdetail.AdLeasehostDetailVo">
select sid,
operator,
dormitoryUser,
housingTypeKey,
housingTypeValue,
basicHousingInformation,
estimatedRentalCost,
leaseTermAndDeposit
from ad_leasehost_detail
where mainSid = #{sid}
</select>
</mapper>

64
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailService.java

@ -0,0 +1,64 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostdetail;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetail;
import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailDto;
import com.yxt.anrui.oa.biz.adexpatriatesdetail.AdExpatriatesDetailVo;
import com.yxt.common.base.service.MybatisBaseService;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
@Service
public class AdLeasehostDetailService extends MybatisBaseService<AdLeasehostDetailMapper, AdLeasehostDetail> {
public void saveDetails(List<AdLeasehostDetailDto> list, String sid) {
//根据sid查询明细并删除
List<AdLeasehostDetail> list2 = baseMapper.selectByMainSid(sid);
list2.removeAll(Collections.singleton(null));
if (!list2.isEmpty()) {
list2.stream().forEach(v -> {
deleteBySid(v.getSid());
});
}
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
list.stream().forEach(details -> {
AdLeasehostDetail adLeasehostDetail = new AdLeasehostDetail();
BeanUtil.copyProperties(details, adLeasehostDetail);
adLeasehostDetail.setMainSid(sid);
baseMapper.insert(adLeasehostDetail);
});
}
}
public List<AdLeasehostDetailVo> getUpdateInit(String sid) {
return baseMapper.getUpdateInit(sid);
}
}

72
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostDetailVo.java

@ -0,0 +1,72 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostdetail;
import com.yxt.anrui.oa.biz.oaform.FormCommon;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* Project: yxt-oa(宿舍租赁) <br/>
* File: AdLeasehostDetailVo.java <br/>
* Class: com.yxt.anrui.oa.api.adleasehostdetail.AdLeasehostDetailVo <br/>
* Description: 宿舍租赁列表 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2025-02-17 14:11:50 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "宿舍租赁列表 视图数据对象", description = "宿舍租赁列表 视图数据对象")
public class AdLeasehostDetailVo implements Vo {
private String sid;
@ApiModelProperty("经办人")
private String operator;
@ApiModelProperty("宿舍使用人")
private String dormitoryUser;
@ApiModelProperty("房屋类型")
private FormCommon housingTypeObj;
private String housingTypeKey;
private String housingTypeValue;
@ApiModelProperty("房屋基本信息")
private String basicHousingInformation;
@ApiModelProperty("租房预计费用")
private BigDecimal estimatedRentalCost;
@ApiModelProperty("租赁期限及租房押金、支付方式")
private String leaseTermAndDeposit;
}

52
yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adleasehostdetail/AdLeasehostListDetailVo.java

@ -0,0 +1,52 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.oa.biz.adleasehostdetail;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@Data
@ApiModel(value = "宿舍租赁列表 视图数据对象", description = "宿舍租赁列表 视图数据对象")
public class AdLeasehostListDetailVo implements Vo {
private String sid;
@ApiModelProperty("经办人")
private String operator;
@ApiModelProperty("宿舍使用人")
private String dormitoryUser;
@ApiModelProperty("房屋类型")
private String housingTypeValue;
@ApiModelProperty("房屋基本信息")
private String basicHousingInformation;
@ApiModelProperty("租房预计费用")
private BigDecimal estimatedRentalCost;
@ApiModelProperty("租赁期限及租房押金、支付方式")
private String leaseTermAndDeposit;
}

13
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java

@ -44,19 +44,6 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: yxt-wms(仓储) <br/>
* File: WmsInventoryCheckbillFeignFallback.java <br/>
* Class: com.yxt.wms.biz.wmsinventorycheckbill.WmsInventoryCheckbillRest <br/>
* Description: 库存盘点. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-03-22 09:25:02 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "库存盘点")
@RestController
@RequestMapping("v1/wmsinventorycheckbill")

2
yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java

@ -9,9 +9,9 @@ public enum ProcDefEnum {
/***************************正式流程id***********************************/
WMSINVENCHECKREPORT("盘点报告审批", "process_wtab67fj:1:14197600"),
WMSINVENTORYPROFITIN("盘盈入库申请", "process_kwd3cagu:1:14197564"),
WMSINVENTORYPROFITOUT("盘亏出库申请", "process_gmjrjghm:1:14197568"),
WMSOLDINVENTORYPROFITIN("旧件盘盈入库申请", "process_kwd3cagu:2:15792504"),
WMSDISINVENTORYPROFITIN("拆件盘盈入库申请", "process_kwd3cagu:3:15792508"),
WMSINVENTORYPROFITOUT("盘亏出库申请", "process_gmjrjghm:1:14197568"),
WMSOLDINVENTORYPROFITOUT("旧件盘亏出库申请", "process_gmjrjghm:2:15792512"),
WMSDISINVENTORYPROFITOUT("拆件盘亏出库申请", "process_gmjrjghm:3:15792516"),
WMSOTHEROUTAPPLY("其他出库(报损出库)", "process_iks2hour:1:14197560"),

Loading…
Cancel
Save