Commit 162603a0 authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent 501c23f0
...@@ -105,7 +105,7 @@ public class TRegisteWarningEmployee extends BaseEntity { ...@@ -105,7 +105,7 @@ public class TRegisteWarningEmployee extends BaseEntity {
@Schema(description = "短信回执内容") @Schema(description = "短信回执内容")
private String message; private String message;
@Schema(description = "类型 1 待建档 2 带完整 3Offer收集短信") @Schema(description = "类型 1 待建档 2 带完整 3瓜子发送Offer提醒 4瓜子发送收集短信 5瓜子合同下载短信")
private String type; private String type;
} }
...@@ -50,7 +50,7 @@ public class TGzOfferInfoVo extends TGzOfferInfo { ...@@ -50,7 +50,7 @@ public class TGzOfferInfoVo extends TGzOfferInfo {
/** /**
* 批量发送短信使用 * 批量发送短信使用
*/ */
@Schema(description = "选中ID,id数组") @Schema(description = "瓜子状态数组")
private List<String> idList; private List<String> statusList;
} }
...@@ -170,9 +170,8 @@ public class TGzOfferInfoController { ...@@ -170,9 +170,8 @@ public class TGzOfferInfoController {
return tGzOfferInfoService.importDiy(file.getInputStream()); return tGzOfferInfoService.importDiy(file.getInputStream());
} }
/** /**
* 新增瓜子offer信息接收表 * 单个/批量发送Offer提醒
* @param tGzOfferInfo 瓜子offer信息接收表 * @param tGzOfferInfo 瓜子offer信息接收表
* @return R * @return R
*/ */
...@@ -183,6 +182,30 @@ public class TGzOfferInfoController { ...@@ -183,6 +182,30 @@ public class TGzOfferInfoController {
return tGzOfferInfoService.sendOfferAlert(tGzOfferInfo); return tGzOfferInfoService.sendOfferAlert(tGzOfferInfo);
} }
/**
* 单个/批量发送收集短信
* @param tGzOfferInfo 瓜子offer信息接收表
* @return R
*/
@Operation(summary = "单个/批量发送收集短信", description = "单个/批量发送收集短信")
@SysLog("单个/批量发送收集短信" )
@PostMapping("/sendCollectOfferMsg")
public R<String> sendCollectOfferMsg(@RequestBody TGzOfferInfoVo tGzOfferInfo) {
return tGzOfferInfoService.sendCollectOfferMsg(tGzOfferInfo);
}
/**
* 单个/批量发送合同下载短信
* @param tGzOfferInfo 瓜子offer信息接收表
* @return R
*/
@Operation(summary = "单个/批量发送合同下载短信", description = "单个/批量发送合同下载短信")
@SysLog("单个/批量发送合同下载短信" )
@PostMapping("/sendContractDownloadOfferMsg")
public R<String> sendContractDownloadOfferMsg(@RequestBody TGzOfferInfoVo tGzOfferInfo) {
return tGzOfferInfoService.sendContractDownloadOfferMsg(tGzOfferInfo);
}
/** /**
* 社保导出花名册记录表 批量导出 * 社保导出花名册记录表 批量导出
* @author hgw * @author hgw
......
...@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.IService; ...@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo; import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzOfferInfoExportSearchVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzOfferInfoExportSearchVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzOfferInfoVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzOfferInfoVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TGzOfferInfoVo;
import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage; import com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
...@@ -99,6 +98,10 @@ public interface TGzOfferInfoService extends IService<TGzOfferInfo> { ...@@ -99,6 +98,10 @@ public interface TGzOfferInfoService extends IService<TGzOfferInfo> {
R<String> sendOfferAlert(TGzOfferInfoVo tGzOfferInfo); R<String> sendOfferAlert(TGzOfferInfoVo tGzOfferInfo);
R<String> sendCollectOfferMsg(TGzOfferInfoVo tGzOfferInfo);
R<String> sendContractDownloadOfferMsg(TGzOfferInfoVo tGzOfferInfo);
/** /**
* @Description: 导出列表 * @Description: 导出列表
* @Author: hgw * @Author: hgw
......
...@@ -118,12 +118,6 @@ ...@@ -118,12 +118,6 @@
<if test="tGzOfferInfo.id != null"> <if test="tGzOfferInfo.id != null">
AND a.id = #{tGzOfferInfo.id} AND a.id = #{tGzOfferInfo.id}
</if> </if>
<if test="tGzOfferInfo.idList != null">
AND a.id in
<foreach item="idStr" index="index" collection="tGzOfferInfo.idList" open="(" separator="," close=")">
#{idStr}
</foreach>
</if>
<if test="tGzOfferInfo.bizId != null and tGzOfferInfo.bizId.trim() != ''"> <if test="tGzOfferInfo.bizId != null and tGzOfferInfo.bizId.trim() != ''">
AND a.biz_id = #{tGzOfferInfo.bizId} AND a.biz_id = #{tGzOfferInfo.bizId}
</if> </if>
...@@ -143,6 +137,12 @@ ...@@ -143,6 +137,12 @@
<if test="tGzOfferInfo.offerSendStatus != null and tGzOfferInfo.offerSendStatus.trim() != ''"> <if test="tGzOfferInfo.offerSendStatus != null and tGzOfferInfo.offerSendStatus.trim() != ''">
AND a.offer_send_status = #{tGzOfferInfo.offerSendStatus} AND a.offer_send_status = #{tGzOfferInfo.offerSendStatus}
</if> </if>
<if test="tGzOfferInfo.statusList != null and tGzOfferInfo.statusList.size() > 0">
AND a.offer_status in
<foreach item="item" index="index" collection="tGzOfferInfo.statusList" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
<if test="tGzOfferInfo.updateBy != null and tGzOfferInfo.updateBy.trim() != ''"> <if test="tGzOfferInfo.updateBy != null and tGzOfferInfo.updateBy.trim() != ''">
AND a.update_by = #{tGzOfferInfo.updateBy} AND a.update_by = #{tGzOfferInfo.updateBy}
</if> </if>
......
...@@ -183,7 +183,6 @@ public class THolidayInfoController { ...@@ -183,7 +183,6 @@ public class THolidayInfoController {
public R getInitBeforeOrAfterWorkDay(@RequestBody TEmployeeInsuranceWorkDayVo vo) { public R getInitBeforeOrAfterWorkDay(@RequestBody TEmployeeInsuranceWorkDayVo vo) {
return R.ok(tHolidayInfoService.getInitBeforeOrAfterWorkDay(vo)); return R.ok(tHolidayInfoService.getInitBeforeOrAfterWorkDay(vo));
} }
/** /**
* @Author huyc * @Author huyc
* @Description 商险派单预计派单日期使用:查询日期的前一个/后一个工作日 * @Description 商险派单预计派单日期使用:查询日期的前一个/后一个工作日
...@@ -193,7 +192,6 @@ public class THolidayInfoController { ...@@ -193,7 +192,6 @@ public class THolidayInfoController {
public R selectBeforeOrAfterWorkDay(@RequestBody TEmployeeInsuranceWorkDayVo vo) { public R selectBeforeOrAfterWorkDay(@RequestBody TEmployeeInsuranceWorkDayVo vo) {
return R.ok(tHolidayInfoService.selectBeforeOrAfterWorkDay(vo)); return R.ok(tHolidayInfoService.selectBeforeOrAfterWorkDay(vo));
} }
/** /**
* @Author huyc * @Author huyc
* @Description 商险派单预计派单日期使用:查询日期的前一个/后一个工作日 * @Description 商险派单预计派单日期使用:查询日期的前一个/后一个工作日
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment