|
|
@ -4,16 +4,19 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.yihu.jw.base.dao.servicePackage.ServicePackageDao;
|
|
|
import com.yihu.jw.base.dao.servicePackage.ServicePackageItemDao;
|
|
|
import com.yihu.jw.base.dao.servicePackage.ServicePackageSignRecordDao;
|
|
|
import com.yihu.jw.base.dao.system.SystemDictEntryDao;
|
|
|
import com.yihu.jw.base.dao.team.BaseTeamDao;
|
|
|
import com.yihu.jw.base.util.ConstantUtils;
|
|
|
import com.yihu.jw.entity.base.org.BaseOrgDO;
|
|
|
import com.yihu.jw.entity.base.servicePackage.ServicePackageDO;
|
|
|
import com.yihu.jw.entity.base.servicePackage.ServicePackageItemDO;
|
|
|
import com.yihu.jw.entity.base.system.SystemDictEntryDO;
|
|
|
import com.yihu.jw.entity.base.team.BaseTeamDO;
|
|
|
import com.yihu.jw.org.dao.BaseOrgDao;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import com.yihu.jw.utils.StringUtil;
|
|
|
import com.yihu.mysql.query.BaseJpaService;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
@ -43,6 +46,8 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
|
|
|
private BaseOrgDao baseOrgDao;
|
|
|
@Autowired
|
|
|
private BaseTeamDao baseTeamDao;
|
|
|
@Autowired
|
|
|
private SystemDictEntryDao systemDictEntryDao;
|
|
|
|
|
|
@Autowired
|
|
|
private ServicePackageSignRecordDao servicePackageSignRecordDao;
|
|
|
@ -85,6 +90,13 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
|
|
|
itemDO1.setDictId(itemDO.getId());
|
|
|
itemDO1.setServicePackageId(servicePackageDO.getId());
|
|
|
itemDO1.setCreateTime(DateUtil.getStringDate());
|
|
|
|
|
|
SystemDictEntryDO systemDictEntryDO = systemDictEntryDao.findByDictCodeAndCode("service_item",itemDO.getCode());
|
|
|
if (systemDictEntryDO!=null){
|
|
|
if (StringUtils.isNotBlank(systemDictEntryDO.getRemark())){//服务项所属专题不为空
|
|
|
itemDO1.setTopicItem(systemDictEntryDO.getRemark());
|
|
|
}
|
|
|
}
|
|
|
itemDOs.add(itemDO1);
|
|
|
}
|
|
|
servicePackageItemDao.save(itemDOs);
|
