|
|
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import com.goafanti.common.dao.TechProjectLogMapper;
|
|
|
import com.goafanti.common.dao.TechProjectMapper;
|
|
|
+import com.goafanti.common.enums.TechProjectStatus;
|
|
|
import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.TechProject;
|
|
|
import com.goafanti.common.model.TechProjectLog;
|
|
|
@@ -23,18 +24,19 @@ import com.goafanti.techproject.bo.TechProjectClientListBo;
|
|
|
import com.goafanti.techproject.bo.TechProjectDetailBo;
|
|
|
import com.goafanti.techproject.bo.TechProjectManageListBo;
|
|
|
import com.goafanti.techproject.service.TechProjectService;
|
|
|
+
|
|
|
@Service
|
|
|
public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> implements TechProjectService {
|
|
|
@Autowired
|
|
|
- private TechProjectMapper techProjectMapper;
|
|
|
+ private TechProjectMapper techProjectMapper;
|
|
|
@Autowired
|
|
|
- private TechProjectLogMapper techProjectLogMapper;
|
|
|
+ private TechProjectLogMapper techProjectLogMapper;
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<TechProjectClientListBo> listClientTechProject(String uid, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
-
|
|
|
+
|
|
|
params.put("uid", uid);
|
|
|
|
|
|
if (pageNo == null || pageNo < 0) {
|
|
|
@@ -44,51 +46,50 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
|
|
|
if (pageSize == null || pageSize < 0) {
|
|
|
pageSize = 10;
|
|
|
}
|
|
|
- return (Pagination<TechProjectClientListBo>)findPage("findTechProjectClientListByPage",
|
|
|
+ return (Pagination<TechProjectClientListBo>) findPage("findTechProjectClientListByPage",
|
|
|
"findTechProjectClientCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public int updateTechProject(TechProject t, TechProjectLog log, Date recordTime) {
|
|
|
- if (null != recordTime && null != log.getState()) {
|
|
|
+ if (null != recordTime && null != log.getState() && null != log.getPrincipal()) {
|
|
|
log.setId(UUID.randomUUID().toString());
|
|
|
log.setPid(t.getId());
|
|
|
log.setRecordTime(recordTime);
|
|
|
- switch (log.getState()) {
|
|
|
- case 1:
|
|
|
+ if (TechProjectStatus.getStatus(log.getState()) == TechProjectStatus.DELIVERD) {
|
|
|
t.setCreateTime(recordTime);
|
|
|
- break;
|
|
|
- case 2:
|
|
|
+ } else if (TechProjectStatus.getStatus(log.getState()) == TechProjectStatus.ACCEPT) {
|
|
|
t.setAcceptDate(recordTime);
|
|
|
- break;
|
|
|
- case 5:
|
|
|
+ } else if (TechProjectStatus.getStatus(log.getState()) == TechProjectStatus.APPRVOVED) {
|
|
|
t.setApprovedDate(recordTime);
|
|
|
- break;
|
|
|
}
|
|
|
- t.setState(log.getState());
|
|
|
+
|
|
|
+ if (TechProjectStatus.getStatus(log.getState()) != TechProjectStatus.CIRCULATION) {
|
|
|
+ t.setState(log.getState());
|
|
|
+ }
|
|
|
techProjectLogMapper.insert(log);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return techProjectMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void saveTechProject(TechProject techProject, String aid) {
|
|
|
+ public void saveTechProject(TechProject techProject, String aid) {
|
|
|
techProject.setId(UUID.randomUUID().toString());
|
|
|
Calendar now = Calendar.getInstance();
|
|
|
now.set(Calendar.MILLISECOND, 0);
|
|
|
techProject.setRecordTime(now.getTime());
|
|
|
- techProject.setState(0);
|
|
|
+ techProject.setState(TechProjectStatus.CREATE.getCode());
|
|
|
techProject.setDeletedSign(0);
|
|
|
- techProjectMapper.insert(techProject);
|
|
|
-
|
|
|
+ techProjectMapper.insert(techProject);
|
|
|
+
|
|
|
TechProjectLog log = new TechProjectLog();
|
|
|
log.setId(UUID.randomUUID().toString());
|
|
|
log.setPid(techProject.getId());
|
|
|
log.setRecordTime(techProject.getRecordTime());
|
|
|
log.setPrincipal(aid);
|
|
|
- log.setState(0);
|
|
|
- if (TokenManager.getToken() instanceof Admin) {
|
|
|
+ log.setState(TechProjectStatus.CREATE.getCode());
|
|
|
+ if (TokenManager.getToken() instanceof Admin) {
|
|
|
log.setOperator(TokenManager.getAdminId());
|
|
|
}
|
|
|
techProjectLogMapper.insert(log);
|
|
|
@@ -99,10 +100,10 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
|
|
|
public Pagination<TechProjectManageListBo> listManageTechProject(String province, String unitName, Integer pageNo,
|
|
|
Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
- if (!StringUtils.isBlank(province)){
|
|
|
+ if (!StringUtils.isBlank(province)) {
|
|
|
params.put("province", province);
|
|
|
}
|
|
|
- if (!StringUtils.isBlank(unitName)){
|
|
|
+ if (!StringUtils.isBlank(unitName)) {
|
|
|
params.put("unitName", unitName);
|
|
|
}
|
|
|
if (pageNo == null || pageNo < 0) {
|
|
|
@@ -112,7 +113,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
|
|
|
if (pageSize == null || pageSize < 0) {
|
|
|
pageSize = 10;
|
|
|
}
|
|
|
- return (Pagination<TechProjectManageListBo>)findPage("findTechProjectManageListByPage",
|
|
|
+ return (Pagination<TechProjectManageListBo>) findPage("findTechProjectManageListByPage",
|
|
|
"findTechProjectManageCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
|