LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

注释不需要内容

Browse Source
This commit is contained in:
zhangqinlin
2021-10-08 17:30:07 +08:00
parent cb99e6f96f
commit 98db4b22e6
5 changed files with 74 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+45 -26
View File
@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.util.AmountUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -80,6 +81,24 @@ public class PayMailContractController extends JeroController<PayMailContract, I
return Result.OK(pageList);
}
/**
* 检测企业审核是否通过
*/
@AutoLog(value = "检测企业审核是否通过")
@ApiOperation(value = "检测企业审核是否通过", notes = "检测企业审核是否通过")
@PostMapping(value = "/check")
public Result<?> check(@RequestParam(name = "id") String id) {
PayMailBillList payMailBillList =payMailContractService.checkOne(id);
if(ObjectUtils.isNotEmpty(payMailBillList)) {
return Result.OK("有权限可以操作!");
}else {
return Result.OK("企业审核未成功无法操作!");
}
}
/**
* 邮寄合同-编辑（邮寄和修改按钮统一接口）
@@ -89,33 +108,33 @@ public class PayMailContractController extends JeroController<PayMailContract, I
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMailContract payMailContract
) {
PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId());
payMailContract.setPostStatus(1);
payMailContractService.updateById(payMailContract);
PayMailContract payMailContractData = payMailContractService.getById(payMailContract.getId());
payMailContract.setPostStatus(1);
payMailContractService.updateById(payMailContract);
if (!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)) {
PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if (!StringUtils.isBlank(payMailContractData.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail()));
}
if (!StringUtils.isBlank(payMailContractData.getMobile())) {
sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile()));
}
HashMap<String, String> map = new HashMap<>();
if (Objects.isNull(payIncomeContract)) {
map.put("contractName", payIncomeContract.getContractName());
}
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG10.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE10");
sendMessageService.SendMessageService(sendMessageDTO);
}
return Result.OK("操作成功!");
if (!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)) {
PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if (!StringUtils.isBlank(payMailContractData.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail()));
}
if (!StringUtils.isBlank(payMailContractData.getMobile())) {
sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile()));
}
HashMap<String, String> map = new HashMap<>();
if (Objects.isNull(payIncomeContract)) {
map.put("contractName", payIncomeContract.getContractName());
}
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG10.getCode());
sendMessageDTO.setTemplateParam(map);
sendMessageDTO.setBusType("C_OPEN_TYPE10");
sendMessageService.SendMessageService(sendMessageDTO);
}
return Result.OK("操作成功!");
}
// /**
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java
+1
View File
@@ -29,4 +29,5 @@ public interface PayMailContractMapper extends BaseMapper<PayMailContract> {
List<PayMailBillList> getOneExcel(@Param("strings") ArrayList<String> strings);
PayMailBillList checkOne(@Param("id") String id);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+21 -1
View File
@@ -18,10 +18,30 @@ pic.principal_name as principalName,
pic.principal_id as principalId,
pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_company_management pcm
on(pic.signed_company_id=pcm.id)
<!-- where pcm.status=1 -->
where pcm.status=1
${ew.customSqlSegment}
</select>
<select id="checkOne" resultType="com.jero.mail.entity.PayMailBillList">
SELECT
pc.id,
pc.post_status as postStatus,
pc.send_method as sendMethod,
pc.post_no as postNo,
pc.liaison_man as liaisonMan,
pc.mobile,
pc.remark,
pc.send_date as sendDate,
pic.contract_num as contractNum,
pic.contract_name as contractName,
pcm.company_name as signedCompanyTemporaryName,
pic.principal_name as principalName,
pic.principal_id as principalId,
pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id) left join pay_company_management pcm
on(pic.signed_company_id=pcm.id)
where pc.id=#{id} and pcm.status=1
</select>
<select id="pageContractExcel" resultType="com.jero.mail.entity.PayMailBillList">
SELECT
pc.id,
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java
+2
View File
@@ -32,4 +32,6 @@ public interface IPayMailContractService extends IService<PayMailContract> {
List<PayMailBillList> getOneExcel(ArrayList<String> strings);
PayMailBillList checkOne(String id);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java
+5
View File
@@ -46,4 +46,9 @@ public class PayMailContractServiceImpl extends ServiceImpl<PayMailContractMappe
public List<PayMailBillList> getOneExcel(ArrayList<String> strings) {
return payMailContractMapper.getOneExcel(strings);
}
@Override
public PayMailBillList checkOne(String id) {
return payMailContractMapper.checkOne(id);
}
}