From 4f1a0c89b40a99e7e3b6ec72b42a1b9d6bac971a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 15:36:19 +0800
Subject: [PATCH] modify
---
/dev/null | 43 -------------------------------------------
zq-erp/src/main/resources/config/application.properties | 12 ++++++------
2 files changed, 6 insertions(+), 49 deletions(-)
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 66e104b..0c3083e 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -4,13 +4,13 @@
#线上测试环境
-#spring.datasource.username=ct_test
-#spring.datasource.password=123456
-#spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=ct_test
+spring.datasource.password=123456
+spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
-spring.datasource.username=chuhuan
-spring.datasource.password=chuhuan
-spring.datasource.url=jdbc:mysql://175.6.132.141:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+#spring.datasource.username=chuhuan
+#spring.datasource.password=chuhuan
+#spring.datasource.url=jdbc:mysql://175.6.132.141:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/MoneyCardUseMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/MoneyCardUseMapperImpl.java
deleted file mode 100644
index a81757d..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/MoneyCardUseMapperImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.vo.VipCardListVo;
-import com.matrix.system.hive.bean.MoneyCardUse;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:11+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class MoneyCardUseMapperImpl extends MoneyCardUseMapper {
-
- @Override
- public VipCardListVo entityToCardListVo(MoneyCardUse moneyCardUse) {
- if ( moneyCardUse == null ) {
- return null;
- }
-
- VipCardListVo vipCardListVo = new VipCardListVo();
-
- vipCardListVo.setCardName( moneyCardUse.getCardName() );
- if ( moneyCardUse.getRealMoney() != null ) {
- vipCardListVo.setRealMoney( BigDecimal.valueOf( moneyCardUse.getRealMoney() ) );
- }
- if ( moneyCardUse.getGiftMoney() != null ) {
- vipCardListVo.setGiftMoney( BigDecimal.valueOf( moneyCardUse.getGiftMoney() ) );
- }
- vipCardListVo.setStatus( moneyCardUse.getStatus() );
- vipCardListVo.setFailTime( moneyCardUse.getFailTime() );
-
- return vipCardListVo;
- }
-
- @Override
- public List<VipCardListVo> entitiesToCardListVos(List<MoneyCardUse> list) {
- if ( list == null ) {
- return null;
- }
-
- List<VipCardListVo> list1 = new ArrayList<VipCardListVo>( list.size() );
- for ( MoneyCardUse moneyCardUse : list ) {
- list1.add( entityToCardListVo( moneyCardUse ) );
- }
-
- return list1;
- }
-}
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/QuestionMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/QuestionMapperImpl.java
deleted file mode 100644
index 55277ac..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/QuestionMapperImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.dto.QuestionAnswerItemDto;
-import com.matrix.system.app.vo.QuestionVo;
-import com.matrix.system.hive.bean.Answer;
-import com.matrix.system.hive.bean.Question;
-import com.matrix.system.hive.bean.VipAnswer;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:10+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class QuestionMapperImpl extends QuestionMapper {
-
- @Override
- public QuestionVo entityToVo(Question question) {
- if ( question == null ) {
- return null;
- }
-
- QuestionVo questionVo = new QuestionVo();
-
- questionVo.setId( question.getId() );
- questionVo.setQuestion( question.getQuestion() );
- questionVo.setType( question.getType() );
- List<Answer> list = question.getAnswers();
- if ( list != null ) {
- questionVo.setAnswers( new ArrayList<Answer>( list ) );
- }
- questionVo.setVipAnswer( question.getVipAnswer() );
-
- return questionVo;
- }
-
- @Override
- public List<QuestionVo> entitiesToVos(List<Question> list) {
- if ( list == null ) {
- return null;
- }
-
- List<QuestionVo> list1 = new ArrayList<QuestionVo>( list.size() );
- for ( Question question : list ) {
- list1.add( entityToVo( question ) );
- }
-
- return list1;
- }
-
- @Override
- public VipAnswer dtoToVipAnswer(QuestionAnswerItemDto questionAnswerDto) {
- if ( questionAnswerDto == null ) {
- return null;
- }
-
- VipAnswer vipAnswer = new VipAnswer();
-
- vipAnswer.setQuesionId( questionAnswerDto.getQuestionId() );
- vipAnswer.setVipId( questionAnswerDto.getVipId() );
- vipAnswer.setAnswerId( questionAnswerDto.getAnswerId() );
- vipAnswer.setAnswerText( questionAnswerDto.getAnswerText() );
-
- return vipAnswer;
- }
-
- @Override
- public List<VipAnswer> dtosToVipAnswers(List<QuestionAnswerItemDto> list) {
- if ( list == null ) {
- return null;
- }
-
- List<VipAnswer> list1 = new ArrayList<VipAnswer>( list.size() );
- for ( QuestionAnswerItemDto questionAnswerItemDto : list ) {
- list1.add( dtoToVipAnswer( questionAnswerItemDto ) );
- }
-
- return list1;
- }
-}
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysBeauticianStateMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysBeauticianStateMapperImpl.java
deleted file mode 100644
index 6fed3ed..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysBeauticianStateMapperImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.dto.CreateServiceOrderItemDto;
-import com.matrix.system.app.vo.ServiceOrderDetailItemVo;
-import com.matrix.system.common.bean.SysUsers;
-import com.matrix.system.hive.bean.ShoppingGoods;
-import com.matrix.system.hive.bean.SysBeauticianState;
-import com.matrix.system.hive.bean.SysProjUse;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:11+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class SysBeauticianStateMapperImpl extends SysBeauticianStateMapper {
-
- @Override
- public SysBeauticianState serviceOrderItemVoToEntity(CreateServiceOrderItemDto dto) {
- if ( dto == null ) {
- return null;
- }
-
- SysBeauticianState sysBeauticianState = new SysBeauticianState();
-
- sysBeauticianState.setPuseId( dto.getPuseId() );
- sysBeauticianState.setCount( dto.getCount() );
-
- return sysBeauticianState;
- }
-
- @Override
- public List<SysBeauticianState> orderItmesVoToEntityList(List<CreateServiceOrderItemDto> dtoList) {
- if ( dtoList == null ) {
- return null;
- }
-
- List<SysBeauticianState> list = new ArrayList<SysBeauticianState>( dtoList.size() );
- for ( CreateServiceOrderItemDto createServiceOrderItemDto : dtoList ) {
- list.add( serviceOrderItemVoToEntity( createServiceOrderItemDto ) );
- }
-
- return list;
- }
-
- @Override
- public ServiceOrderDetailItemVo entityToDetailItemVo(SysBeauticianState sysBeauticianState) {
- if ( sysBeauticianState == null ) {
- return null;
- }
-
- ServiceOrderDetailItemVo serviceOrderDetailItemVo = new ServiceOrderDetailItemVo();
-
- serviceOrderDetailItemVo.setName( sysBeauticianStateProjInfoName( sysBeauticianState ) );
- serviceOrderDetailItemVo.setTimeLength( sysBeauticianStateProjInfoTimeLength( sysBeauticianState ) );
- if ( sysBeauticianState.getExtract() != null ) {
- serviceOrderDetailItemVo.setCommission( new BigDecimal( sysBeauticianState.getExtract() ) );
- }
- Double price = sysBeauticianStateProjUsePrice( sysBeauticianState );
- if ( price != null ) {
- serviceOrderDetailItemVo.setPrice( BigDecimal.valueOf( price ) );
- }
- serviceOrderDetailItemVo.setBeautyName( sysBeauticianStateBeautiStaffInfoSuName( sysBeauticianState ) );
- serviceOrderDetailItemVo.setCount( sysBeauticianState.getCount() );
- serviceOrderDetailItemVo.setBeginTime( sysBeauticianState.getBeginTime() );
- serviceOrderDetailItemVo.setEndTime( sysBeauticianState.getEndTime() );
-
- return serviceOrderDetailItemVo;
- }
-
- @Override
- public List<ServiceOrderDetailItemVo> entitiesToDetailItemsVo(List<SysBeauticianState> list) {
- if ( list == null ) {
- return null;
- }
-
- List<ServiceOrderDetailItemVo> list1 = new ArrayList<ServiceOrderDetailItemVo>( list.size() );
- for ( SysBeauticianState sysBeauticianState : list ) {
- list1.add( entityToDetailItemVo( sysBeauticianState ) );
- }
-
- return list1;
- }
-
- private String sysBeauticianStateProjInfoName(SysBeauticianState sysBeauticianState) {
- if ( sysBeauticianState == null ) {
- return null;
- }
- ShoppingGoods projInfo = sysBeauticianState.getProjInfo();
- if ( projInfo == null ) {
- return null;
- }
- String name = projInfo.getName();
- if ( name == null ) {
- return null;
- }
- return name;
- }
-
- private Integer sysBeauticianStateProjInfoTimeLength(SysBeauticianState sysBeauticianState) {
- if ( sysBeauticianState == null ) {
- return null;
- }
- ShoppingGoods projInfo = sysBeauticianState.getProjInfo();
- if ( projInfo == null ) {
- return null;
- }
- Integer timeLength = projInfo.getTimeLength();
- if ( timeLength == null ) {
- return null;
- }
- return timeLength;
- }
-
- private Double sysBeauticianStateProjUsePrice(SysBeauticianState sysBeauticianState) {
- if ( sysBeauticianState == null ) {
- return null;
- }
- SysProjUse projUse = sysBeauticianState.getProjUse();
- if ( projUse == null ) {
- return null;
- }
- Double price = projUse.getPrice();
- if ( price == null ) {
- return null;
- }
- return price;
- }
-
- private String sysBeauticianStateBeautiStaffInfoSuName(SysBeauticianState sysBeauticianState) {
- if ( sysBeauticianState == null ) {
- return null;
- }
- SysUsers beautiStaffInfo = sysBeauticianState.getBeautiStaffInfo();
- if ( beautiStaffInfo == null ) {
- return null;
- }
- String suName = beautiStaffInfo.getSuName();
- if ( suName == null ) {
- return null;
- }
- return suName;
- }
-}
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjServiceMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjServiceMapperImpl.java
deleted file mode 100644
index a7df2af..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjServiceMapperImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.vo.ServiceOrderDetailVo;
-import com.matrix.system.hive.bean.SysProjServices;
-import com.matrix.system.hive.bean.SysVipInfo;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:11+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class SysProjServiceMapperImpl extends SysProjServiceMapper {
-
- @Override
- public ServiceOrderDetailVo projServiceToDetailVo(SysProjServices projServices) {
- if ( projServices == null ) {
- return null;
- }
-
- ServiceOrderDetailVo serviceOrderDetailVo = new ServiceOrderDetailVo();
-
- serviceOrderDetailVo.setStaffName( projServices.getCreateStaffName() );
- serviceOrderDetailVo.setVipName( projServicesVipInfoVipName( projServices ) );
- serviceOrderDetailVo.setPhone( projServicesVipInfoPhone( projServices ) );
- serviceOrderDetailVo.setStatus( projServices.getState() );
- serviceOrderDetailVo.setComment( projServices.getComment() );
- serviceOrderDetailVo.setServiceNo( projServices.getServiceNo() );
- serviceOrderDetailVo.setYyTime( projServices.getYyTime() );
- serviceOrderDetailVo.setBedName( projServices.getBedName() );
- serviceOrderDetailVo.setPlsName( projServices.getPlsName() );
- serviceOrderDetailVo.setTotalTime( projServices.getTotalTime() );
-
- return serviceOrderDetailVo;
- }
-
- private String projServicesVipInfoVipName(SysProjServices sysProjServices) {
- if ( sysProjServices == null ) {
- return null;
- }
- SysVipInfo vipInfo = sysProjServices.getVipInfo();
- if ( vipInfo == null ) {
- return null;
- }
- String vipName = vipInfo.getVipName();
- if ( vipName == null ) {
- return null;
- }
- return vipName;
- }
-
- private String projServicesVipInfoPhone(SysProjServices sysProjServices) {
- if ( sysProjServices == null ) {
- return null;
- }
- SysVipInfo vipInfo = sysProjServices.getVipInfo();
- if ( vipInfo == null ) {
- return null;
- }
- String phone = vipInfo.getPhone();
- if ( phone == null ) {
- return null;
- }
- return phone;
- }
-}
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjUseMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjUseMapperImpl.java
deleted file mode 100644
index f302790..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysProjUseMapperImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.vo.ServiceProjVo;
-import com.matrix.system.app.vo.ServiceTcVo;
-import com.matrix.system.hive.bean.SysProjUse;
-import com.matrix.system.hive.bean.SysProjUseFlow;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:11+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class SysProjUseMapperImpl extends SysProjUseMapper {
-
- @Override
- public ServiceTcVo entityToServiceTcVo(SysProjUse sysProjUse) {
- if ( sysProjUse == null ) {
- return null;
- }
-
- ServiceTcVo serviceTcVo = new ServiceTcVo();
-
- serviceTcVo.setName( sysProjUse.getProjName() );
- if ( sysProjUse.getSurplusCount() != null ) {
- serviceTcVo.setCount( String.valueOf( sysProjUse.getSurplusCount() ) );
- }
- serviceTcVo.setInvalidTime( sysProjUse.getFailTime() );
- serviceTcVo.setId( sysProjUse.getId() );
- serviceTcVo.setProjId( sysProjUse.getProjId() );
- serviceTcVo.setIsCourse( sysProjUse.getIsCourse() );
- serviceTcVo.setIsInfinite( sysProjUse.getIsInfinite() );
-
- return serviceTcVo;
- }
-
- @Override
- public List<ServiceTcVo> entityListToTcVoList(List<SysProjUse> list) {
- if ( list == null ) {
- return null;
- }
-
- List<ServiceTcVo> list1 = new ArrayList<ServiceTcVo>( list.size() );
- for ( SysProjUse sysProjUse : list ) {
- list1.add( entityToServiceTcVo( sysProjUse ) );
- }
-
- return list1;
- }
-
- @Override
- public ServiceProjVo entityToServiceProjVo(SysProjUse sysProjUse) {
- if ( sysProjUse == null ) {
- return null;
- }
-
- ServiceProjVo serviceProjVo = new ServiceProjVo();
-
- serviceProjVo.setName( sysProjUse.getProjName() );
- serviceProjVo.setCount( sysProjUse.getSurplusCount() );
- serviceProjVo.setInvalidTime( sysProjUse.getFailTime() );
- serviceProjVo.setTimeLength( sysProjUse.getTimeLength() );
- serviceProjVo.setProjId( sysProjUse.getProjId() );
- serviceProjVo.setImg( sysProjUse.getImg() );
- serviceProjVo.setId( sysProjUse.getId() );
-
- return serviceProjVo;
- }
-
- @Override
- public List<ServiceProjVo> entityListToProjVoList(List<SysProjUse> list) {
- if ( list == null ) {
- return null;
- }
-
- List<ServiceProjVo> list1 = new ArrayList<ServiceProjVo>( list.size() );
- for ( SysProjUse sysProjUse : list ) {
- list1.add( entityToServiceProjVo( sysProjUse ) );
- }
-
- return list1;
- }
-
- @Override
- public SysProjUseFlow projUseToFlow(SysProjUse sysProjUse) {
- if ( sysProjUse == null ) {
- return null;
- }
-
- SysProjUseFlow sysProjUseFlow = new SysProjUseFlow();
-
- sysProjUseFlow.setProjUseId( sysProjUse.getId() );
- HashMap<String, Object> hashMap = sysProjUse.getDicMap();
- if ( hashMap != null ) {
- sysProjUseFlow.setDicMap( new HashMap<String, Object>( hashMap ) );
- }
- sysProjUseFlow.setCreateBy( sysProjUse.getCreateBy() );
- sysProjUseFlow.setCreateTime( sysProjUse.getCreateTime() );
- sysProjUseFlow.setUpdateBy( sysProjUse.getUpdateBy() );
- sysProjUseFlow.setUpdateTime( sysProjUse.getUpdateTime() );
- sysProjUseFlow.setId( sysProjUse.getId() );
- sysProjUseFlow.setSurplusCount( sysProjUse.getSurplusCount() );
- sysProjUseFlow.setIsOver( sysProjUse.getIsOver() );
- sysProjUseFlow.setFailTime( sysProjUse.getFailTime() );
- sysProjUseFlow.setPrice( sysProjUse.getPrice() );
- sysProjUseFlow.setStatus( sysProjUse.getStatus() );
- sysProjUseFlow.setBalance( sysProjUse.getBalance() );
- sysProjUseFlow.setRemark( sysProjUse.getRemark() );
- sysProjUseFlow.setProjName( sysProjUse.getProjName() );
-
- return sysProjUseFlow;
- }
-}
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysSkinCheckRecordMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysSkinCheckRecordMapperImpl.java
deleted file mode 100644
index 0ffe6c4..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysSkinCheckRecordMapperImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.vo.SkinCheckAnalysisItems;
-import com.matrix.system.app.vo.SkinCheckDetailVo;
-import com.matrix.system.app.vo.SkinCheckDiagnoseItemVo;
-import com.matrix.system.app.vo.SkinCheckListVo;
-import com.matrix.system.hive.bean.SysSkinCheckRecord;
-import com.matrix.system.hive.bean.SysSkinDetail;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:11+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class SysSkinCheckRecordMapperImpl extends SysSkinCheckRecordMapper {
-
- @Override
- public SkinCheckListVo entityToSkinCheckListVo(SysSkinCheckRecord sysSkinCheckRecord) {
- if ( sysSkinCheckRecord == null ) {
- return null;
- }
-
- SkinCheckListVo skinCheckListVo = new SkinCheckListVo();
-
- skinCheckListVo.setId( sysSkinCheckRecord.getId() );
- skinCheckListVo.setCheckUserName( sysSkinCheckRecord.getCheckUserName() );
- skinCheckListVo.setShopName( sysSkinCheckRecord.getShopName() );
- skinCheckListVo.setCheckTime( sysSkinCheckRecord.getCheckTime() );
-
- return skinCheckListVo;
- }
-
- @Override
- public List<SkinCheckListVo> entitiesToListVos(List<SysSkinCheckRecord> list) {
- if ( list == null ) {
- return null;
- }
-
- List<SkinCheckListVo> list1 = new ArrayList<SkinCheckListVo>( list.size() );
- for ( SysSkinCheckRecord sysSkinCheckRecord : list ) {
- list1.add( entityToSkinCheckListVo( sysSkinCheckRecord ) );
- }
-
- return list1;
- }
-
- @Override
- public SkinCheckDetailVo entityToDetailVo(SysSkinCheckRecord sysSkinCheckRecord) {
- if ( sysSkinCheckRecord == null ) {
- return null;
- }
-
- SkinCheckDetailVo skinCheckDetailVo = new SkinCheckDetailVo();
-
- skinCheckDetailVo.setVipName( sysSkinCheckRecord.getUserName() );
- skinCheckDetailVo.setSex( sysSkinCheckRecord.getExt2() );
- skinCheckDetailVo.setCheckTime( sysSkinCheckRecord.getCheckTime() );
-
- return skinCheckDetailVo;
- }
-
- @Override
- public SkinCheckDiagnoseItemVo entityToDiagnoseItem(SysSkinDetail sysSkinDetail) {
- if ( sysSkinDetail == null ) {
- return null;
- }
-
- SkinCheckDiagnoseItemVo skinCheckDiagnoseItemVo = new SkinCheckDiagnoseItemVo();
-
- skinCheckDiagnoseItemVo.setTitle( sysSkinDetail.getSymptom() );
- skinCheckDiagnoseItemVo.setPercentage( sysSkinDetail.getPercentage() );
-
- return skinCheckDiagnoseItemVo;
- }
-
- @Override
- public List<SkinCheckDiagnoseItemVo> entitiesToDiagnoseItems(List<SysSkinDetail> list) {
- if ( list == null ) {
- return null;
- }
-
- List<SkinCheckDiagnoseItemVo> list1 = new ArrayList<SkinCheckDiagnoseItemVo>( list.size() );
- for ( SysSkinDetail sysSkinDetail : list ) {
- list1.add( entityToDiagnoseItem( sysSkinDetail ) );
- }
-
- return list1;
- }
-
- @Override
- public SkinCheckAnalysisItems entityToAnalysisItem(SysSkinDetail sysSkinDetail) {
- if ( sysSkinDetail == null ) {
- return null;
- }
-
- SkinCheckAnalysisItems skinCheckAnalysisItems = new SkinCheckAnalysisItems();
-
- skinCheckAnalysisItems.setTitle( sysSkinDetail.getSymptom() );
- skinCheckAnalysisItems.setProductIds( sysSkinDetail.getProductIds() );
- skinCheckAnalysisItems.setImg( sysSkinDetail.getImg() );
- skinCheckAnalysisItems.setAnalysis( sysSkinDetail.getAnalysis() );
- skinCheckAnalysisItems.setSolution( sysSkinDetail.getSolution() );
-
- return skinCheckAnalysisItems;
- }
-
- @Override
- public List<SkinCheckAnalysisItems> entitiesToAnalysisItems(List<SysSkinDetail> list) {
- if ( list == null ) {
- return null;
- }
-
- List<SkinCheckAnalysisItems> list1 = new ArrayList<SkinCheckAnalysisItems>( list.size() );
- for ( SysSkinDetail sysSkinDetail : list ) {
- list1.add( entityToAnalysisItem( sysSkinDetail ) );
- }
-
- return list1;
- }
-}
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysStoreInfoMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysStoreInfoMapperImpl.java
deleted file mode 100644
index 58f3dcc..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysStoreInfoMapperImpl.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.vo.StoreInOutListVo;
-import com.matrix.system.app.vo.StoreListVo;
-import com.matrix.system.hive.bean.ShoppingGoods;
-import com.matrix.system.hive.bean.SysStoreInfo;
-import com.matrix.system.hive.pojo.StoreInOutRecordVO;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:11+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class SysStoreInfoMapperImpl extends SysStoreInfoMapper {
-
- @Override
- public StoreListVo entityToStoreVo(SysStoreInfo sysStoreInfo) {
- if ( sysStoreInfo == null ) {
- return null;
- }
-
- StoreListVo storeListVo = new StoreListVo();
-
- storeListVo.setImg( sysStoreInfoGoodsImg( sysStoreInfo ) );
- storeListVo.setGoodsCode( sysStoreInfoGoodsCode( sysStoreInfo ) );
- storeListVo.setGoodsName( sysStoreInfoGoodsName( sysStoreInfo ) );
- storeListVo.setAlarmNum( sysStoreInfoGoodsAlarmNum( sysStoreInfo ) );
- if ( sysStoreInfo.getStoreTotal() != null ) {
- storeListVo.setStoreTotal( sysStoreInfo.getStoreTotal().intValue() );
- }
-
- return storeListVo;
- }
-
- @Override
- public List<StoreListVo> entitiesToStoreVos(List<SysStoreInfo> list) {
- if ( list == null ) {
- return null;
- }
-
- List<StoreListVo> list1 = new ArrayList<StoreListVo>( list.size() );
- for ( SysStoreInfo sysStoreInfo : list ) {
- list1.add( entityToStoreVo( sysStoreInfo ) );
- }
-
- return list1;
- }
-
- @Override
- public StoreInOutListVo recordVoToInOutListVo(StoreInOutRecordVO recordVO) {
- if ( recordVO == null ) {
- return null;
- }
-
- StoreInOutListVo storeInOutListVo = new StoreInOutListVo();
-
- storeInOutListVo.setContent( recordVO.getOrderType() );
- storeInOutListVo.setOrderNo( recordVO.getOrderNo() );
- if ( recordVO.getAmount() != null ) {
- storeInOutListVo.setAmount( BigDecimal.valueOf( recordVO.getAmount() ) );
- }
- storeInOutListVo.setCreateTime( recordVO.getCreateTime() );
-
- return storeInOutListVo;
- }
-
- @Override
- public List<StoreInOutListVo> recordVosToInOutListVos(List<StoreInOutRecordVO> list) {
- if ( list == null ) {
- return null;
- }
-
- List<StoreInOutListVo> list1 = new ArrayList<StoreInOutListVo>( list.size() );
- for ( StoreInOutRecordVO storeInOutRecordVO : list ) {
- list1.add( recordVoToInOutListVo( storeInOutRecordVO ) );
- }
-
- return list1;
- }
-
- private String sysStoreInfoGoodsImg(SysStoreInfo sysStoreInfo) {
- if ( sysStoreInfo == null ) {
- return null;
- }
- ShoppingGoods goods = sysStoreInfo.getGoods();
- if ( goods == null ) {
- return null;
- }
- String img = goods.getImg();
- if ( img == null ) {
- return null;
- }
- return img;
- }
-
- private String sysStoreInfoGoodsCode(SysStoreInfo sysStoreInfo) {
- if ( sysStoreInfo == null ) {
- return null;
- }
- ShoppingGoods goods = sysStoreInfo.getGoods();
- if ( goods == null ) {
- return null;
- }
- String code = goods.getCode();
- if ( code == null ) {
- return null;
- }
- return code;
- }
-
- private String sysStoreInfoGoodsName(SysStoreInfo sysStoreInfo) {
- if ( sysStoreInfo == null ) {
- return null;
- }
- ShoppingGoods goods = sysStoreInfo.getGoods();
- if ( goods == null ) {
- return null;
- }
- String name = goods.getName();
- if ( name == null ) {
- return null;
- }
- return name;
- }
-
- private Integer sysStoreInfoGoodsAlarmNum(SysStoreInfo sysStoreInfo) {
- if ( sysStoreInfo == null ) {
- return null;
- }
- ShoppingGoods goods = sysStoreInfo.getGoods();
- if ( goods == null ) {
- return null;
- }
- Integer alarmNum = goods.getAlarmNum();
- if ( alarmNum == null ) {
- return null;
- }
- return alarmNum;
- }
-}
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysUsersMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysUsersMapperImpl.java
deleted file mode 100644
index 11e994b..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysUsersMapperImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.dto.ModifyUserDto;
-import com.matrix.system.app.vo.BeauticianVo;
-import com.matrix.system.app.vo.UserInfoDetailVo;
-import com.matrix.system.common.bean.SysUsers;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:11+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class SysUsersMapperImpl extends SysUsersMapper {
-
- @Override
- public BeauticianVo sysUsersToBeauticianVo(SysUsers sysUsers) {
- if ( sysUsers == null ) {
- return null;
- }
-
- BeauticianVo beauticianVo = new BeauticianVo();
-
- beauticianVo.setName( sysUsers.getSuName() );
- beauticianVo.setPhoto( sysUsers.getSuPhoto() );
- beauticianVo.setId( sysUsers.getSuId() );
- beauticianVo.setTelphone( sysUsers.getSuTel() );
- beauticianVo.setRoleName( sysUsers.getRoleName() );
-
- return beauticianVo;
- }
-
- @Override
- public List<BeauticianVo> usersListToBeautyList(List<SysUsers> list) {
- if ( list == null ) {
- return null;
- }
-
- List<BeauticianVo> list1 = new ArrayList<BeauticianVo>( list.size() );
- for ( SysUsers sysUsers : list ) {
- list1.add( sysUsersToBeauticianVo( sysUsers ) );
- }
-
- return list1;
- }
-
- @Override
- public UserInfoDetailVo usersToDetailInfoVo(SysUsers sysUsers) {
- if ( sysUsers == null ) {
- return null;
- }
-
- UserInfoDetailVo userInfoDetailVo = new UserInfoDetailVo();
-
- userInfoDetailVo.setBirthday( sysUsers.getSuBirthday() );
- userInfoDetailVo.setEngName( sysUsers.getSuAliases() );
- userInfoDetailVo.setAddress( sysUsers.getSuAddress() );
- userInfoDetailVo.setTelphone( sysUsers.getSuTel() );
- userInfoDetailVo.setSex( sysUsers.getSuSex() );
- userInfoDetailVo.setName( sysUsers.getSuName() );
- userInfoDetailVo.setPhoto( sysUsers.getSuPhoto() );
- userInfoDetailVo.setServiceSign( sysUsers.getServiceSignature() );
- userInfoDetailVo.setEmail( sysUsers.getSuEmail() );
-
- return userInfoDetailVo;
- }
-
- @Override
- public ModifyUserDto usersToModifyUserDto(SysUsers sysUsers) {
- if ( sysUsers == null ) {
- return null;
- }
-
- ModifyUserDto modifyUserDto = new ModifyUserDto();
-
- return modifyUserDto;
- }
-
- @Override
- public SysUsers modifyUserDtoToUsers(ModifyUserDto modifyUserDto) {
- if ( modifyUserDto == null ) {
- return null;
- }
-
- SysUsers sysUsers = new SysUsers();
-
- sysUsers.setSuAliases( modifyUserDto.getEngName() );
- sysUsers.setSuTel( modifyUserDto.getTelphone() );
- sysUsers.setSuBirthday( modifyUserDto.getBirthday() );
- sysUsers.setServiceSignature( modifyUserDto.getServiceSign() );
- sysUsers.setSuAddress( modifyUserDto.getAddress() );
- sysUsers.setSuEmail( modifyUserDto.getEmail() );
- sysUsers.setSuPhoto( modifyUserDto.getPhoto() );
- sysUsers.setSuName( modifyUserDto.getName() );
- sysUsers.setSuSex( modifyUserDto.getSex() );
-
- return sysUsers;
- }
-}
diff --git a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysWorkBeatuistaffMapperImpl.java b/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysWorkBeatuistaffMapperImpl.java
deleted file mode 100644
index cbd2a70..0000000
--- a/zq-erp/src/main/resources/generated-sources/annotations/com/matrix/system/app/mapper/SysWorkBeatuistaffMapperImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.matrix.system.app.mapper;
-
-import com.matrix.system.app.vo.BeauticianVo;
-import com.matrix.system.hive.bean.SysWorkBeatuistaff;
-import java.util.ArrayList;
-import java.util.List;
-import javax.annotation.Generated;
-
-@Generated(
- value = "org.mapstruct.ap.MappingProcessor",
- date = "2021-01-26T20:08:11+0800",
- comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_181 (Oracle Corporation)"
-)
-public class SysWorkBeatuistaffMapperImpl extends SysWorkBeatuistaffMapper {
-
- @Override
- public BeauticianVo workBeautyToBeautyVo(SysWorkBeatuistaff sysWorkBeatuistaff) {
- if ( sysWorkBeatuistaff == null ) {
- return null;
- }
-
- BeauticianVo beauticianVo = new BeauticianVo();
-
- beauticianVo.setName( sysWorkBeatuistaff.getWorkStaffName() );
- beauticianVo.setId( sysWorkBeatuistaff.getStaffId() );
-
- return beauticianVo;
- }
-
- @Override
- public List<BeauticianVo> workBeautysToBeautyVos(List<SysWorkBeatuistaff> sysWorkBeatuistaff) {
- if ( sysWorkBeatuistaff == null ) {
- return null;
- }
-
- List<BeauticianVo> list = new ArrayList<BeauticianVo>( sysWorkBeatuistaff.size() );
- for ( SysWorkBeatuistaff sysWorkBeatuistaff1 : sysWorkBeatuistaff ) {
- list.add( workBeautyToBeautyVo( sysWorkBeatuistaff1 ) );
- }
-
- return list;
- }
-}
--
Gitblit v1.9.1