新增创建人创建日期

This commit is contained in:
piaobo 2025-07-29 16:38:34 +08:00
parent cf11d9f711
commit a6e014d0fa
9 changed files with 67 additions and 17 deletions

View File

@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.common.utils.bean.BeanUtils;
import com.zhyc.module.base.domain.SheepFile;
import com.zhyc.module.base.mapper.SheepFileMapper;
@ -72,21 +73,20 @@ public class DewormServiceImpl implements IDewormService
@Transactional
public int insertDeworm(Deworm deworm)
{
String username = SecurityUtils.getUsername();
// 使用记录的文件
SwMedicineUsage medicineUsage = new SwMedicineUsage();
medicineUsage.setSwMedicineUsageDetailsList(deworm.getUsageDetails());
medicineUsage.setName("羊只驱虫");
medicineUsage.setUseType("1");
List<Deworm> deworms = new ArrayList<>();
deworm.setCreateBy(username);
deworm.setCreateTime(DateUtils.getNowDate());
for (Integer sheepId : deworm.getSheepIds()) {
SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId));
System.out.println(sheepFile);
Deworm dew = new Deworm();
BeanUtils.copyProperties(deworm, dew);
dew.setSheepId(Long.valueOf(sheepId));
@ -98,7 +98,6 @@ public class DewormServiceImpl implements IDewormService
dew.setParity(sheepFile.getParity());
// 获取药品使用记录的id
Integer usageId = medicineUsageService.insertSwMedicineUsage(medicineUsage);
dew.setUsageId(usageId);
deworms.add(dew);
}
@ -117,12 +116,20 @@ public class DewormServiceImpl implements IDewormService
@Transactional
public int updateDeworm(Deworm deworm)
{
String username = SecurityUtils.getUsername();
for (SwMedicineUsageDetails usageDetail : deworm.getUsageDetails()) {
usageDetail.setMediUsage(deworm.getUsageId());
}
medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(deworm.getUsageId());
SwMedicineUsage swMedicineUsage = new SwMedicineUsage();
swMedicineUsage.setId(deworm.getUsageId());
swMedicineUsage.setUpdateBy(username);
swMedicineUsage.setUpdateTime(DateUtils.getNowDate());
medicineUsageMapper.updateSwMedicineUsage(swMedicineUsage);
medicineUsageMapper.batchSwMedicineUsageDetails(deworm.getUsageDetails());
deworm.setUpdateBy(username);
deworm.setUpdateTime(DateUtils.getNowDate());
return dewormMapper.updateDeworm(deworm);
}

View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Objects;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.module.base.domain.BasSheep;
import com.zhyc.module.base.domain.SheepFile;
import com.zhyc.module.base.mapper.BasSheepMapper;
@ -70,6 +71,9 @@ public class DiagnosisServiceImpl implements IDiagnosisService
diagnosis.setParity(String.valueOf(sheepFile.getParity()));
diagnosis.setGender(String.valueOf(sheepFile.getGender()));
diagnosis.setMonthAge(sheepFile.getMonthAge());
String username = SecurityUtils.getUsername();
diagnosis.setCreateBy(username);
diagnosis.setCreateTime(DateUtils.getNowDate());
if (!Objects.equals(sheepFile.getSheepfoldId(), diagnosis.getSheepfoldId())){
BasSheep basSheep = new BasSheep();
@ -94,6 +98,11 @@ public class DiagnosisServiceImpl implements IDiagnosisService
BasSheep basSheep = new BasSheep();
basSheep.setId(diagnosis.getSheepId());
basSheep.setSheepfoldId(diagnosis.getSheepfoldId());
String username = SecurityUtils.getUsername();
basSheep.setUpdateBy(username);
basSheep.setUpdateTime(DateUtils.getNowDate());
diagnosis.setUpdateBy(username);
diagnosis.setUpdateTime(DateUtils.getNowDate());
sheepMapper.updateBasSheep(basSheep);
return diagnosisMapper.updateDiagnosis(diagnosis);
}

View File

@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.common.utils.bean.BeanUtils;
import com.zhyc.module.base.domain.SheepFile;
import com.zhyc.module.base.mapper.SheepFileMapper;
@ -74,6 +75,7 @@ public class DisinfectServiceImpl implements IDisinfectService
@Override
public int insertDisinfect(Disinfect disinfect)
{
String username = SecurityUtils.getUsername();
// 使用记录的文件
SwMedicineUsage medicineUsage = new SwMedicineUsage();
medicineUsage.setSwMedicineUsageDetailsList(disinfect.getUsageDetails());
@ -82,7 +84,10 @@ public class DisinfectServiceImpl implements IDisinfectService
List<Disinfect> disinfects = new ArrayList<>();
disinfect.setCreateBy(username);
disinfect.setCreateTime(DateUtils.getNowDate());
for (Integer sheepfold : disinfect.getSheepfoldIds()) {
Disinfect dis = new Disinfect();
BeanUtils.copyProperties(disinfect,dis);
@ -111,6 +116,8 @@ public class DisinfectServiceImpl implements IDisinfectService
}
medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(disinfect.getUsageId());
medicineUsageMapper.batchSwMedicineUsageDetails(disinfect.getUsageDetails());
String username = SecurityUtils.getUsername();
disinfect.setUpdateBy(username);
disinfect.setUpdateTime(DateUtils.getNowDate());
return disinfectMapper.updateDisinfect(disinfect);
}

View File

@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.common.utils.bean.BeanUtils;
import com.zhyc.module.base.domain.SheepFile;
import com.zhyc.module.base.mapper.SheepFileMapper;
@ -73,19 +74,19 @@ public class HealthServiceImpl implements IHealthService
@Override
public int insertHealth(Health health)
{
String username = SecurityUtils.getUsername();
// 使用记录的文件
SwMedicineUsage medicineUsage = new SwMedicineUsage();
medicineUsage.setSwMedicineUsageDetailsList(health.getUsageDetails());
medicineUsage.setName("羊只保健");
medicineUsage.setUseType("2");
List<Health> healths = new ArrayList<>();
health.setCreateBy(username);
health.setCreateTime(DateUtils.getNowDate());
for (Integer sheepId : health.getSheepIds()) {
SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId));
System.out.println(sheepFile);
Health heal = new Health();
BeanUtils.copyProperties(health, heal);
heal.setSheepId(Long.valueOf(sheepId));
@ -102,9 +103,6 @@ public class HealthServiceImpl implements IHealthService
heal.setUsageId(usageId);
healths.add(heal);
}
health.setCreateTime(DateUtils.getNowDate());
return healthMapper.insertHealth(healths);
}
@ -122,6 +120,8 @@ public class HealthServiceImpl implements IHealthService
}
medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(health.getUsageId());
medicineUsageMapper.batchSwMedicineUsageDetails(health.getUsageDetails());
String username = SecurityUtils.getUsername();
health.setUpdateBy(username);
health.setUpdateTime(DateUtils.getNowDate());
return healthMapper.updateHealth(health);
}

View File

@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.common.utils.bean.BeanUtils;
import com.zhyc.module.base.domain.SheepFile;
import com.zhyc.module.base.mapper.SheepFileMapper;
@ -75,21 +76,23 @@ public class ImmunityServiceImpl implements IImmunityService
@Override
public int insertImmunity(Immunity immunity)
{
String username = SecurityUtils.getUsername();
// 使用记录的文件
SwMedicineUsage medicineUsage = new SwMedicineUsage();
medicineUsage.setSwMedicineUsageDetailsList(immunity.getUsageDetails());
medicineUsage.setName("羊只免疫");
medicineUsage.setUseType("0");
medicineUsage.setCreateBy(username);
List<Immunity> immunities = new ArrayList<>();
immunity.setUpdateBy(username);
immunity.setCreateTime(DateUtils.getNowDate());
System.out.println();
for (Integer sheepId : immunity.getSheepIds()) {
SheepFile sheepFile = sheepFileMapper.selectSheepFileById(Long.valueOf(sheepId));
System.out.println(sheepFile);
Immunity imm = new Immunity();
BeanUtils.copyProperties(immunity, imm);
imm.setSheepId(Long.valueOf(sheepId));

View File

@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.common.utils.StringUtils;
import com.zhyc.common.utils.bean.BeanUtils;
import com.zhyc.module.base.domain.SheepFile;
@ -60,6 +61,8 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService
@Override
public int insertQuarantineReport(QuarantineReport quarantineReport)
{
String username = SecurityUtils.getUsername();
quarantineReport.setCreateBy(username);
quarantineReport.setCreateTime(DateUtils.getNowDate());
if (quarantineReport.getResult()==null){
quarantineReport.setStatus(0);
@ -94,6 +97,8 @@ public class QuarantineReportServiceImpl implements IQuarantineReportService
@Override
public int updateQuarantineReport(QuarantineReport quarantineReport)
{
String username = SecurityUtils.getUsername();
quarantineReport.setUpdateBy(username);
quarantineReport.setUpdateTime(DateUtils.getNowDate());
return quarantineReportMapper.updateQuarantineReport(quarantineReport);
}

View File

@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.service.impl;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.module.biosafety.service.ISwMedicineUsageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -58,6 +59,8 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService
@Override
public int insertSwMedicineUsage(SwMedicineUsage swMedicineUsage)
{
String username = SecurityUtils.getUsername();
swMedicineUsage.setCreateBy(username);
swMedicineUsage.setCreateTime(DateUtils.getNowDate());
int rows = swMedicineUsageMapper.insertSwMedicineUsage(swMedicineUsage);
insertSwMedicineUsageDetails(swMedicineUsage);
@ -74,6 +77,8 @@ public class SwMedicineUsageServiceImpl implements ISwMedicineUsageService
@Override
public int updateSwMedicineUsage(SwMedicineUsage swMedicineUsage)
{
String username = SecurityUtils.getUsername();
swMedicineUsage.setUpdateBy(username);
swMedicineUsage.setUpdateTime(DateUtils.getNowDate());
swMedicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(swMedicineUsage.getId());
insertSwMedicineUsageDetails(swMedicineUsage);

View File

@ -2,6 +2,7 @@ package com.zhyc.module.biosafety.service.impl;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.module.biosafety.domain.SwPresDetail;
import com.zhyc.module.biosafety.domain.SwPrescription;
import com.zhyc.module.biosafety.mapper.SwPrescriptionMapper;
@ -58,6 +59,8 @@ public class SwPrescriptionServiceImpl implements ISwPrescriptionService
@Override
public int insertSwPrescription(SwPrescription swPrescription)
{
String username = SecurityUtils.getUsername();
swPrescription.setCreateBy(username);
swPrescription.setCreateTime(DateUtils.getNowDate());
int rows = swPrescriptionMapper.insertSwPrescription(swPrescription);
insertSwPresDetail(swPrescription);
@ -74,6 +77,8 @@ public class SwPrescriptionServiceImpl implements ISwPrescriptionService
@Override
public int updateSwPrescription(SwPrescription swPrescription)
{
String username = SecurityUtils.getUsername();
swPrescription.setUpdateBy(username);
swPrescription.setUpdateTime(DateUtils.getNowDate());
swPrescriptionMapper.deleteSwPresDetailByPersId(swPrescription.getId());
insertSwPresDetail(swPrescription);

View File

@ -3,6 +3,7 @@ package com.zhyc.module.biosafety.service.impl;
import java.util.ArrayList;
import java.util.List;
import com.zhyc.common.utils.DateUtils;
import com.zhyc.common.utils.SecurityUtils;
import com.zhyc.common.utils.bean.BeanUtils;
import com.zhyc.module.base.domain.SheepFile;
import com.zhyc.module.base.mapper.SheepFileMapper;
@ -73,12 +74,14 @@ public class TreatmentServiceImpl implements ITreatmentService
@Transactional
public int insertTreatment(Treatment treatment)
{
String username = SecurityUtils.getUsername();
// 使用记录的文件
SwMedicineUsage medicineUsage = new SwMedicineUsage();
medicineUsage.setSwMedicineUsageDetailsList(treatment.getUsageDetails());
medicineUsage.setName("羊只治疗");
medicineUsage.setUseType("4");
medicineUsage.setCreateBy(username);
medicineUsage.setCreateTime(DateUtils.getNowDate());
// 新增单挑数据
if (treatment.getSheepId()!=null){
// 药品使用记录
@ -132,11 +135,17 @@ public class TreatmentServiceImpl implements ITreatmentService
@Transactional
public int updateTreatment(Treatment treatment)
{
String username = SecurityUtils.getUsername();
for (SwMedicineUsageDetails usageDetail : treatment.getUsageDetails()) {
usageDetail.setMediUsage(treatment.getUsageId());
}
medicineUsageMapper.deleteSwMedicineUsageDetailsByMediUsage(treatment.getUsageId());
SwMedicineUsage swMedicineUsage = new SwMedicineUsage();
swMedicineUsage.setId(treatment.getUsageId());
swMedicineUsage.setUpdateBy(username);
medicineUsageMapper.updateSwMedicineUsage(swMedicineUsage);
medicineUsageMapper.batchSwMedicineUsageDetails(treatment.getUsageDetails());
treatment.setUpdateBy(username);
treatment.setUpdateTime(DateUtils.getNowDate());
return treatmentMapper.updateTreatment(treatment);
}