|
|
@@ -30,6 +30,7 @@ import com.goafanti.common.utils.DateUtils;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.contract.bo.ContractDetail;
|
|
|
import com.goafanti.contract.bo.ContractManageListBo;
|
|
|
+import com.goafanti.contract.bo.ContractSerialNumber;
|
|
|
import com.goafanti.contract.service.ContractService;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
@@ -219,7 +220,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
|
|
|
c.setStatus(ContractStatus.CIRCULATION.getCode());
|
|
|
c.setSignDate(signDate);
|
|
|
contractMapper.updateByPrimaryKeySelective(c);
|
|
|
-
|
|
|
+
|
|
|
ContractLog clog = disposeContractLog(c);
|
|
|
clog.setStatus(ContractStatus.SIGN.getCode());
|
|
|
clog.setRecordTime(signDate);
|
|
|
@@ -264,4 +265,19 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
|
|
|
return n;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Map<String, Integer> selectContractSerialNumber() {
|
|
|
+ String principal = null;
|
|
|
+ if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)) {
|
|
|
+ principal = TokenManager.getAdminId();
|
|
|
+ }
|
|
|
+ List<ContractSerialNumber> list = contractMapper.selectContractSerialNumber(principal);
|
|
|
+ Map<String, Integer> map = new HashMap<>();
|
|
|
+ if (null != list && list.size() > 0) {
|
|
|
+ for (ContractSerialNumber c : list) {
|
|
|
+ map.put(c.getContractId(), c.getSerialNumber());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return map;
|
|
|
+ }
|
|
|
}
|